Merge branch 'master' of http://1.94.244.160:3000/shuzhihua/pms-iot

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotrydailyreport/IotRyDailyReportMapper.java

@@ -82,7 +82,6 @@ public interface IotRyDailyReportMapper extends BaseMapperX<IotRyDailyReportDO>
         if (CollUtil.isNotEmpty(statuses)) { // 判断集合非空
             queryWrapper.and(wrapper -> wrapper
                     .notIn(IotRyDailyReportDO::getRigStatus, statuses) // rigStatus 不在集合中
-                    .or() // 或
                     .notIn(IotRyDailyReportDO::getRepairStatus, statuses) // repairStatus 不在集合中
             );
         }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/dailyreport/CreateRyDailyReportWithSgDeviceOrderJob.java

@@ -0,0 +1,313 @@
+package cn.iocoder.yudao.module.pms.job.dailyreport;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.module.pms.constant.PmsConstants;
+import cn.iocoder.yudao.module.pms.controller.admin.depttype.vo.IotDeptTypePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotprojectinfo.vo.IotProjectInfoPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotProjectTaskPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotrydailyreport.vo.IotRyDailyReportPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.depttype.IotDeptTypeDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojectinfo.IotProjectInfoDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttask.IotProjectTaskDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotrydailyreport.IotRyDailyReportDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.depttype.IotDeptTypeMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotrydailyreport.IotRyDailyReportMapper;
+import cn.iocoder.yudao.module.pms.message.PmsMessage;
+import cn.iocoder.yudao.module.pms.service.iotprojectinfo.IotProjectInfoService;
+import cn.iocoder.yudao.module.pms.service.iotprojecttask.IotProjectTaskService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.module.pms.framework.config.MultiThreadConfiguration.PMS_THREAD_POOL_TASK_EXECUTOR;
+
+/**
+ * 瑞鹰 包含 施工设备 队伍 生成  日报
+ * 推送到公共账号 填报后审批日报
+ */
+@Component
+@Slf4j
+public class CreateRyDailyReportWithSgDeviceOrderJob implements JobHandler {
+    @Resource
+    private IotProjectInfoService iotProjectInfoService;
+    @Resource
+    private IotRyDailyReportMapper iotRyDailyReportMapper;
+
+    @Autowired
+    private IotDeviceMapper iotDeviceMapper;
+    @Resource
+    private IotProjectTaskService iotProjectTaskService;
+    @Resource
+    private AdminUserApi adminUserApi;
+
+    @Resource
+    private IotDeptTypeMapper iotDeptTypeMapper;
+    @Resource(name = PMS_THREAD_POOL_TASK_EXECUTOR)
+    private ThreadPoolTaskExecutor pmsThreadPoolTaskExecutor;
+    @Resource
+    private PmsMessage pmsMessage;
+    @Resource
+    private DeptService deptService;
+
+    @Override
+    @TenantIgnore
+    public String execute(String param) throws Exception {
+
+        // 查询瑞鹰下所有部门 筛选出 钻井 或 修井 队伍(包含施工设备的队伍)
+        IotDeptTypePageReqVO deptTypeReqVO = new IotDeptTypePageReqVO();
+        // 查询 钻井 修井 类型的部门
+        List<IotDeptTypeDO> deptTypes = iotDeptTypeMapper.selectList(deptTypeReqVO);
+        Set<Long> xjDeptIds = new HashSet<>();
+        // 符合要求 的部门id集合
+        Set<Long> affiliatedDeptIds = new HashSet<>();
+
+        AtomicReference<String> creator = new AtomicReference<>(StrUtil.EMPTY);
+        // key部门id  value部门下填报日报人员账号
+        Map<Long, String> deptCreatorPair = new HashMap<>();
+        // key部门id  value部门下填报日报人员id
+        Map<Long, Long> deptCreatorIdPair = new HashMap<>();
+        Set<String> creators = new HashSet<>();
+        Set<Long> zjDeptIds = new HashSet<>();
+        Set<Long> xjDepartmentIds = new HashSet<>();
+        Long userId = 0l;
+        if (CollUtil.isNotEmpty(deptTypes)) {
+            deptTypes.forEach(deptType -> {
+                if (StrUtil.isNotBlank(deptType.getUpdater())) {
+                    xjDeptIds.add(deptType.getDeptId());
+                }
+                // 部分部门的日报需要由固定的人填写 RYMQC
+                if (StrUtil.isNotBlank(deptType.getCreator())) {
+                    affiliatedDeptIds.add(deptType.getDeptId());
+                    creator.set(deptType.getCreator());
+                    deptCreatorPair.put(deptType.getDeptId(), deptType.getCreator());
+                    creators.add(deptType.getCreator());
+                }
+                // 钻井部门id集合
+                if ("zj".equals(deptType.getType())) {
+                    zjDeptIds.add(deptType.getDeptId());
+                }
+                // 修井部门id集合
+                if ("xj".equals(deptType.getType())) {
+                    xjDepartmentIds.add(deptType.getDeptId());
+                }
+            });
+            // 根据 用户账号 查询用户id 挂靠队伍 日报填报人
+            if (StrUtil.isNotBlank(creator.get())) {
+                // List<AdminUserRespDTO> users = adminUserApi.getUserListByUsername(creator.get());
+                List<AdminUserRespDTO> users = adminUserApi.getUserListByUsernames(creators);
+                if (CollUtil.isNotEmpty(users)) {
+                    AdminUserRespDTO user = users.get(0);
+                    userId = user.getId();
+                    users.forEach(staff -> {
+                        String username = staff.getUsername();
+                        Long staffId = staff.getId();
+                        deptCreatorPair.forEach((deptId, userNo) -> {
+                            if (userNo.equals(username)) {
+                                deptCreatorIdPair.put(deptId, staffId);
+                            }
+                        });
+                    });
+                }
+            }
+        }
+        // 查询瑞鹰下所有队伍
+        Set<Long> ryTeamDeptIds = new HashSet<>();
+        // 查询瑞鹰所有 队伍 项目部
+        Set<Long> ryChildDeptIds = deptService.getChildDeptIdListFromCache(158l);
+        List<DeptDO> departments = deptService.getDeptList(ryChildDeptIds);
+        if (CollUtil.isNotEmpty(departments)) {
+            departments.forEach(dept -> {
+                if ("3".equals(dept.getType())) {
+                    ryTeamDeptIds.add(dept.getId());
+                }
+            });
+        }
+        // 查询瑞鹰所有队伍关联的设备 筛选出包含设备的队伍
+        IotDevicePageReqVO reqVO = new IotDevicePageReqVO();
+        reqVO.setDeptIds(new ArrayList<>(ryTeamDeptIds));
+        List<IotDeviceDO> devices = iotDeviceMapper.selectListAlone(reqVO);
+        // 包含设备的部门id集合
+        Set<Long> containsDeviceDeptIds = new HashSet<>();
+        Set<Long> sgDeptIds = new HashSet<>();
+        if (CollUtil.isNotEmpty(devices)) {
+            devices.forEach(device -> {
+                String deviceStatus = device.getDeviceStatus();
+                if ("sg".equals(deviceStatus)) {
+                    sgDeptIds.add(device.getDeptId());
+                }
+                containsDeviceDeptIds.add(device.getDeptId());
+            });
+        }
+        // 包含 施工 设备的队伍id集合
+        Set<Long> containDeviceXjDeptIds = xjDeptIds.stream()
+                .filter(deptId -> containsDeviceDeptIds.contains(deptId))
+                .filter(deptId -> sgDeptIds.contains(deptId))
+                .collect(Collectors.toSet());
+
+        // 查询包含设备 钻井 修井 队伍日报列表
+        IotRyDailyReportPageReqVO ryReqVO = new IotRyDailyReportPageReqVO();
+        ryReqVO.setDeptIds(containDeviceXjDeptIds);
+        List<IotRyDailyReportDO> ryDailyReports = iotRyDailyReportMapper.dailyReports(ryReqVO);
+
+        // 查询所有瑞鹰的项目任务 以‘部门-时间’ 为唯一键 当天创建时间 内没有生成过日报 就自动生成
+        LocalDateTime currentDate = LocalDateTime.now();
+        String currentFormatDateStr = LocalDateTimeUtil.format(currentDate, "yyyy-MM-dd");
+
+        // 当天已经生成日报的修井队伍deptId集合
+        Set<Long> currentDayReportedDeptIds = new HashSet<>();
+        if (CollUtil.isNotEmpty(ryDailyReports)) {
+            ryDailyReports.forEach(report -> {
+                // 查询当天生成的日报
+                LocalDateTime createDate = report.getCreateTime();
+                String formatDateStr = LocalDateTimeUtil.format(createDate, "yyyy-MM-dd");
+                if (formatDateStr.equals(currentFormatDateStr)) {
+                    currentDayReportedDeptIds.add(report.getDeptId());
+                }
+            });
+        }
+        // 所有的部门id
+        Set<Long> reportedDeptIds = new HashSet<>();
+        // 今天生成日报部门id
+        Optional.ofNullable(currentDayReportedDeptIds)
+                .ifPresent(reportedDeptIds::addAll);
+
+        // 如果当天的 钻井修井 日报记录中没有 包含施工设备的修井队伍部门id 则生成队伍日报记录
+        Set<Long> tobeReportXjDeptIds = containDeviceXjDeptIds.stream()
+                .filter(deptId -> !reportedDeptIds.contains(deptId))
+                .collect(Collectors.toSet());
+
+        if (CollUtil.isNotEmpty(tobeReportXjDeptIds)) {
+            // 查询这些部门对象集合
+            Map<Long, DeptDO> deptMap = deptService.getDeptMap(tobeReportXjDeptIds);
+
+            // 查询这些部门所有的项目任务 筛选未完工的任务
+            IotProjectTaskPageReqVO taskReqVO = new IotProjectTaskPageReqVO();
+            taskReqVO.setCompanyId(158l);
+            taskReqVO.setJobFlag("Y");
+            List<IotProjectTaskDO> tasks = iotProjectTaskService.projectTasks(taskReqVO);
+            Map<Long, Set<Long>> taskDeptPair = new HashMap<>();
+            // key任务id   value项目id
+            Map<Long, Long> taskProjectPair = new HashMap<>();
+            // key任务id   value井号
+            Map<Long, String> taskWellNamePair = new HashMap<>();
+            Set<Long> projectIds = new HashSet<>();
+            if (CollUtil.isNotEmpty(tasks)) {
+                tasks.forEach(task -> {
+                    taskDeptPair.put(task.getId(), task.getDeptIds());
+                    projectIds.add(task.getProjectId());
+                    taskProjectPair.put(task.getId(), task.getProjectId());
+                    taskWellNamePair.put(task.getId(), task.getWellName());
+                });
+            }
+            Map<Long, IotProjectInfoDO> projectPair = new HashMap<>();
+            if (CollUtil.isNotEmpty(projectIds)) {
+                IotProjectInfoPageReqVO projectReqVO = new IotProjectInfoPageReqVO();
+                projectReqVO.setProjectIds(new ArrayList<>(projectIds));
+                List<IotProjectInfoDO> projects = iotProjectInfoService.getIotProjectInfos(projectReqVO);
+                if (CollUtil.isNotEmpty(projects)) {
+                    projects.forEach(project -> {
+                        projectPair.put(project.getId(), project);
+                    });
+                }
+            }
+
+            List<IotRyDailyReportDO> tobeAddedReports = new ArrayList<>();
+            for (Long tobeReportXjDeptId : tobeReportXjDeptIds) {
+                IotRyDailyReportDO noDeviceReport = new IotRyDailyReportDO();
+                noDeviceReport.setId(null);
+                noDeviceReport.setDeptId(tobeReportXjDeptId);
+                noDeviceReport.setCreateTime(LocalDateTime.now());
+                noDeviceReport.setUpdateTime(LocalDateTime.now());
+                if (deptCreatorIdPair.containsKey(tobeReportXjDeptId)) {
+                    noDeviceReport.setCreator(deptCreatorIdPair.get(tobeReportXjDeptId).toString());
+                }
+                if (zjDeptIds.contains(tobeReportXjDeptId)) {
+                    // 钻井日报类型
+                    noDeviceReport.setProjectClassification("1");
+                }
+                if (xjDepartmentIds.contains(tobeReportXjDeptId)) {
+                    // 修井日报类型
+                    noDeviceReport.setProjectClassification("2");
+                }
+                // 设置日报的项目任务信息
+                if (CollUtil.isNotEmpty(taskDeptPair)) {
+                    taskDeptPair.forEach((taskId, deptIds) -> {
+                        if (deptIds.contains(tobeReportXjDeptId)) {
+                            noDeviceReport.setTaskId(taskId);
+                            // 设置任务对应的项目信息
+                            if (taskProjectPair.containsKey(taskId)) {
+                                noDeviceReport.setProjectId(taskProjectPair.get(taskId));
+                            }
+                        }
+                    });
+                }
+                tobeAddedReports.add(noDeviceReport);
+            }
+
+            if (CollUtil.isNotEmpty(tobeAddedReports)) {
+                iotRyDailyReportMapper.insertBatch(tobeAddedReports);
+
+                // 异步发送消息提醒 钉钉 站内信
+                // 查询所有日报的创建人 userId 集合
+                Set<Long> userIds = new HashSet<>(convertList(tobeAddedReports, report -> Long.valueOf(report.getCreator())));
+                Map<Long, AdminUserRespDTO> users = adminUserApi.getUserMap(userIds);
+                // 建立日报与 用户手机号的 对应关系
+                Map<Long, String> reportMobilePair = new HashMap<>();
+                tobeAddedReports.forEach(report -> {
+                    if (users.containsKey(Long.valueOf(report.getCreator()))) {
+                        AdminUserRespDTO user = users.get(Long.valueOf(report.getCreator()));
+                        reportMobilePair.put(report.getId(), user.getMobile());
+                    }
+                });
+                // 异步多线程发送 站内信 钉钉 消息
+                tobeAddedReports.forEach(report -> {
+                    CountDownLatch latch = new CountDownLatch(tobeAddedReports.size());
+                    // deptMap 部门集合   taskWellNamePair任务集合
+                    Long deptId = report.getDeptId();
+                    DeptDO dept = deptMap.get(deptId);
+                    String msgTitle = dept.getName();
+                    Long taskId = report.getTaskId();
+                    if (ObjUtil.isNotEmpty(taskId)) {
+                        String wellName = taskWellNamePair.get(taskId);
+                        msgTitle = StrUtil.join("-", msgTitle, wellName);
+                    }
+                    String finalMsgTitle = msgTitle;
+                    pmsThreadPoolTaskExecutor.execute(() -> {
+                        try {
+                            if (reportMobilePair.containsKey(report.getId())) {
+                                String mobile = reportMobilePair.get(report.getId());
+                                pmsMessage.sendMessage(report.getId(), finalMsgTitle, PmsConstants.RY_XJ_DAILY_REPORT,
+                                        Long.valueOf(report.getCreator()), mobile);
+                            }
+                        } finally {
+                            latch.countDown();
+                        }
+                    });
+                });
+
+            }
+        }
+        return "创建成功";
+    }
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/dailyreport/CreateYfDailyReportStatisticsJob.java

@@ -501,8 +501,16 @@ public class CreateYfDailyReportStatisticsJob implements JobHandler {
             List<IotFiveDailyReportDO> fiveMonthReports = pageMonthFiveReports.getList();
             // 5号公司月完工井
             BigDecimal fiveMonthCompleteWells = BigDecimal.ZERO;
+            // 5号公司月压裂层
+            BigDecimal fiveMonthSumLayers = BigDecimal.ZERO;
             Set<Long> fiveMonthCompleteTaskIds = new HashSet<>();
             if (CollUtil.isNotEmpty(fiveMonthReports)) {
+                // 求和：所有日报压裂层 单位：层
+                fiveMonthSumLayers = fiveReports.stream()
+                        .map(IotFiveDailyReportDO::getDailyWorkingLayers)
+                        .filter(Objects::nonNull)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+
                 fiveMonthReports.forEach(report -> {
                     Long taskId = report.getTaskId();
                     String fiveStatus = report.getFiveStatus();
@@ -521,8 +529,16 @@ public class CreateYfDailyReportStatisticsJob implements JobHandler {
             List<IotFiveDailyReportDO> fiveYearReports = pageYearFiveReports.getList();
             // 5号公司 年完工井
             BigDecimal fiveYearCompleteWells = BigDecimal.ZERO;
+            // 5号公司年压裂层
+            BigDecimal fiveYearSumLayers = BigDecimal.ZERO;
             Set<Long> fiveYearCompleteTaskIds = new HashSet<>();
             if (CollUtil.isNotEmpty(fiveYearReports)) {
+                // 求和：所有日报压裂层 单位：层
+                fiveYearSumLayers = fiveReports.stream()
+                        .map(IotFiveDailyReportDO::getDailyWorkingLayers)
+                        .filter(Objects::nonNull)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+
                 fiveYearReports.forEach(report -> {
                     Long taskId = report.getTaskId();
                     String fiveStatus = report.getFiveStatus();
@@ -574,8 +590,8 @@ public class CreateYfDailyReportStatisticsJob implements JobHandler {
             finalMsgBuilder.append("═ ═ ═ ═ ═ ═ ═ ═  \n");
             finalMsgBuilder.append("公司：5#项目公司  \n");
             finalMsgBuilder.append("日压裂层：").append(fiveDaySumLayers).append(" 层  \n");
-            finalMsgBuilder.append("月完工井：").append(fiveMonthCompleteTaskIds.size()).append(" 井  \n");
-            finalMsgBuilder.append("年完工井：").append(fiveYearCompleteTaskIds.size()).append(" 井  \n");
+            finalMsgBuilder.append("月压裂层：").append(fiveMonthSumLayers).append(" 井  \n");
+            finalMsgBuilder.append("年压裂层：").append(fiveYearSumLayers).append(" 井  \n");
             finalMsgBuilder.append("设备利用率：").append(fiveDeviceUtilization).append("  \n");
             finalMsgBuilder.append("═ ═ ═ ═ ═ ═ ═ ═  \n");