运行记录优化0926-1

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/IotDeviceController.java

@@ -245,8 +245,34 @@ public class IotDeviceController {
         }
         Map<Long, DeptDO> deptMap = deptService.getDeptMap(
                 convertList(pageResult.getList(), IotDeviceDO::getDeptId));
-        return success(new PageResult<>(IotDeviceConvert.INSTANCE.convertList(pageResult.getList(), deptMap),
-                pageResult.getTotal()));
+        // 查询当前分页的设备是否已经设置了 保养BOM
+        List<Long> deviceIds = convertList(pageResult.getList(), IotDeviceDO::getId);
+        IotDevicePageReqVO reqVO = new IotDevicePageReqVO();
+        reqVO.setDeviceIds(deviceIds);
+        reqVO.setBomFlag("b");
+        List<IotDeviceRespVO> devicesWithBoms = iotDeviceService.deviceAssociateBomList(reqVO);
+        Map<Long, List<IotDeviceRespVO>> devicesWithBomsPair = new HashMap<>();
+        if (CollUtil.isNotEmpty(devicesWithBoms)) {
+            devicesWithBoms.forEach(bom -> {
+                if (devicesWithBomsPair.containsKey(bom.getId())) {
+                    List<IotDeviceRespVO> tempDevices = devicesWithBomsPair.get(bom.getId());
+                    tempDevices.add(bom);
+                    devicesWithBomsPair.put(bom.getId(), tempDevices);
+                } else {
+                    List<IotDeviceRespVO> tempDevices = new ArrayList<>();
+                    tempDevices.add(bom);
+                    devicesWithBomsPair.put(bom.getId(), tempDevices);
+                }
+            });
+        }
+        List<IotDeviceRespVO> iotDeviceRespVOS = IotDeviceConvert.INSTANCE.convertList(pageResult.getList(), deptMap);
+        iotDeviceRespVOS.forEach(e ->{
+            // 设置保养项标识
+            if (devicesWithBomsPair.containsKey(e.getId())) {
+                e.setHasSetMaintenanceBom(true);
+            }
+        });
+        return success(new PageResult<>(iotDeviceRespVOS, pageResult.getTotal()));
     }
 
     @GetMapping("/getDevicesByDepts")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskPageReqVO.java

@@ -49,7 +49,7 @@ public class IotProjectTaskPageReqVO extends PageParam {
     private String workloadUnit;
 
     @Schema(description = "状态", example = "1")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskRespVO.java

@@ -59,9 +59,9 @@ public class IotProjectTaskRespVO {
     @ExcelProperty("工作量单位(段/层/方/井深/进尺)")
     private String workloadUnit;
 
-    @Schema(description = "状态", example = "1")
+    @Schema(description = "状态", example = "dq sg")
     @ExcelProperty("状态")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskSaveReqVO.java

@@ -42,7 +42,7 @@ public class IotProjectTaskSaveReqVO {
     private String workloadDesign;
 
     @Schema(description = "状态", example = "1")
-    private Integer status;
+    private String status;
 
     @Schema(description = "工作量单位(段/层/方/井深/进尺)")
     private String workloadUnit;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttaskschedule/vo/IotProjectTaskSchedulePageReqVO.java

@@ -24,7 +24,7 @@ public class IotProjectTaskSchedulePageReqVO extends PageParam {
     private Long taskId;
 
     @Schema(description = "施工状态(工作量开始/动迁/准备/施工)", example = "2")
-    private Integer status;
+    private String status;
 
     @Schema(description = "施工阶段描述", example = "你说的对")
     private String description;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttaskschedule/vo/IotProjectTaskScheduleRespVO.java

@@ -26,7 +26,7 @@ public class IotProjectTaskScheduleRespVO {
 
     @Schema(description = "施工状态(工作量开始/动迁/准备/施工)", example = "2")
     @ExcelProperty("施工状态(工作量开始/动迁/准备/施工)")
-    private Integer status;
+    private String status;
 
     @Schema(description = "施工阶段描述", example = "你说的对")
     @ExcelProperty("施工阶段描述")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttaskschedule/vo/IotProjectTaskScheduleSaveReqVO.java

@@ -19,7 +19,7 @@ public class IotProjectTaskScheduleSaveReqVO {
     private Long taskId;
 
     @Schema(description = "施工状态(工作量开始/动迁/准备/施工)", example = "2")
-    private Integer status;
+    private String status;
 
     @Schema(description = "施工阶段描述", example = "你说的对")
     private String description;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/vo/IotRhDailyReportPageReqVO.java

@@ -77,7 +77,7 @@ public class IotRhDailyReportPageReqVO extends PageParam {
     private String nextPlan;
 
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
-    private Integer constructionStatus;
+    private String constructionStatus;
 
     @Schema(description = "人员情况")
     private String personnel;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/vo/IotRhDailyReportRespVO.java

@@ -87,7 +87,7 @@ public class IotRhDailyReportRespVO {
 
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
     @ExcelProperty("施工状态(动迁 准备 施工 完工)")
-    private Integer constructionStatus;
+    private String constructionStatus;
 
     @Schema(description = "人员情况")
     @ExcelProperty("人员情况")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/vo/IotRhDailyReportSaveReqVO.java

@@ -65,7 +65,7 @@ public class IotRhDailyReportSaveReqVO {
     private String nextPlan;
 
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
-    private Integer constructionStatus;
+    private String constructionStatus;
 
     @Schema(description = "人员情况")
     private String personnel;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/vo/IotRyDailyReportPageReqVO.java

@@ -83,7 +83,7 @@ public class IotRyDailyReportPageReqVO extends PageParam {
     private String nextPlan;
 
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "1")
-    private Integer rigStatus;
+    private String rigStatus;
 
     @Schema(description = "人员情况")
     private String personnel;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/vo/IotRyDailyReportRespVO.java

@@ -132,7 +132,7 @@ public class IotRyDailyReportRespVO {
 
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "1")
     @ExcelProperty("施工状态(动迁 准备 施工 完工)")
-    private Integer rigStatus;
+    private String rigStatus;
 
     @Schema(description = "人员情况")
     @ExcelProperty("人员情况")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/vo/IotRyDailyReportSaveReqVO.java

@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotrydailyreport.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -98,7 +97,7 @@ public class IotRyDailyReportSaveReqVO {
     private String nextPlan;
 
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "1")
-    private Integer rigStatus;
+    private String rigStatus;
 
     @Schema(description = "人员情况")
     private String personnel;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojecttask/IotProjectTaskDO.java

@@ -76,7 +76,7 @@ public class IotProjectTaskDO extends BaseDO {
     /**
      * 状态
      */
-    private Integer status;
+    private String status;
     /**
      * 用户名
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojecttaskschedule/IotProjectTaskScheduleDO.java

@@ -39,7 +39,7 @@ public class IotProjectTaskScheduleDO extends BaseDO {
     /**
      * 施工状态(工作量开始/动迁/准备/施工)
      */
-    private Integer status;
+    private String status;
     /**
      * 施工阶段描述
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotrhdailyreport/IotRhDailyReportDO.java

@@ -100,7 +100,7 @@ public class IotRhDailyReportDO extends BaseDO {
     /**
      * 施工状态(动迁 准备 施工 完工)
      */
-    private Integer constructionStatus;
+    private String constructionStatus;
     /**
      * 人员情况
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotrydailyreport/IotRyDailyReportDO.java

@@ -154,7 +154,7 @@ public class IotRyDailyReportDO extends BaseDO {
     /**
      * 施工状态(动迁 准备 施工 完工)
      */
-    private Integer rigStatus;
+    private String rigStatus;
     /**
      * 人员情况
      */

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

@@ -81,6 +81,7 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
                 .likeIfPresent(IotDeviceDO::getDeviceCode, reqVO.getDeviceCode())
                 .likeIfPresent(IotDeviceDO::getDeviceName, reqVO.getDeviceName())
                 .eqIfPresent(IotDeviceDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotDeviceDO::getDeptId, reqVO.getDeptIds())
                 .eqIfPresent(IotDeviceDO::getBrand, reqVO.getBrand())
                 .eqIfPresent(IotDeviceDO::getModel, reqVO.getModel())
                 .eqIfPresent(IotDeviceDO::getDeviceStatus, reqVO.getDeviceStatus())

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

@@ -6,7 +6,9 @@ import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.pms.constant.PmsConstants;
+import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportSaveReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectPlanDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillOrderDO;
@@ -18,6 +20,7 @@ import cn.iocoder.yudao.module.pms.dal.mysql.iotoperationplan.IotOperationPlanMa
 import cn.iocoder.yudao.module.pms.dal.mysql.iotoperationplandev.IotOperationPlanDevMapper;
 import cn.iocoder.yudao.module.pms.message.PmsMessage;
 import cn.iocoder.yudao.module.pms.service.iotopeationfill.IotOpeationFillService;
+import cn.iocoder.yudao.module.pms.service.iotrhdailyreport.IotRhDailyReportService;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -26,6 +29,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -62,6 +66,8 @@ public class IotOperationPlanJob implements JobHandler {
     private DeptService deptService;
     @Resource
     private IotOpeationFillService opeationFillService;
+    @Resource
+    private IotRhDailyReportService iotRhDailyReportService;
     /**
      * 1、查询开启状态运行计划
      * 2、根据计划获取设备
@@ -272,6 +278,12 @@ public class IotOperationPlanJob implements JobHandler {
             boolean rhContain = rhIdList.contains(plan.getDeptId());
 
             if(rhContain){
+
+                //创建日报设备
+                List <IotOpeationFillDO> devList = opeationFillService.reportMethod(orderList1);
+                //插入日报设备
+                iotOpeationFillMapper.insertFill(devList);
+
                 //2、瑞恒无指定队伍全部队伍插入日报设备
                 //筛选正常工单部门id
                 List<Long> deptIdList = orderList1.stream().map(IotOpeationFillOrderDO::getDeptId).collect(Collectors.toList());
@@ -298,36 +310,39 @@ public class IotOperationPlanJob implements JobHandler {
                 }
                 //创建虚拟工单
                 if(verRPList.size()>0){
-                    List<IotOpeationFillOrderDO> virOrderList = new ArrayList<>();
-                    for (IotOpeationFillDO pd:verRPList) {
-                        IotOpeationFillOrderDO fillDO = new IotOpeationFillOrderDO();
-                        fillDO.setOrderName(pd.getOrgName()+"/"+LocalDate.now()+"运行记录填报");
-                        fillDO.setDeptId(pd.getDeptId());
-                        fillDO.setOrderStatus(0);
-                        fillDO.setCreateTime(LocalDateTime.now());
-                        fillDO.setUserName(pd.getUserName());
-                        fillDO.setUserId(pd.getUserId());
-                        fillDO.setMobile(pd.getMobile());
-                        virOrderList.add(fillDO);
-                    }
-                    if(virOrderList.size()>0){
-                        orderList1.addAll(virOrderList);
-                        //插入虚拟工单工单
-                        iotOpeationFillOrderMapper.insertBatch(virOrderList);
-
+                    for (IotOpeationFillDO vir:verRPList) {
+                        IotRhDailyReportSaveReqVO saveReqVO = new IotRhDailyReportSaveReqVO();
+                        //查询队伍增压机状态
+                        IotDeviceDO virDev = new IotDeviceDO();
+                        virDev.setDeptId(vir.getDeptId());
+                        IotDeviceDO devStatus = iotOpeationFillMapper.devStatus(virDev);
+                        //不为空则为日报赋值
+                        if(devStatus!=null){
+                            saveReqVO.setConstructionStatus(devStatus.getDeviceStatus());
+                        }
+                        //当日注气量
+                        saveReqVO.setDailyGasInjection(BigDecimal.valueOf(0.00));
+                        //当日注水量
+                        saveReqVO.setDailyWaterInjection(BigDecimal.valueOf(0.00));
+                        //当日注气时间
+                        saveReqVO.setDailyInjectGasTime(BigDecimal.valueOf(0.00));
+                        //当日注水时间
+                        saveReqVO.setDailyInjectWaterTime(BigDecimal.valueOf(0.00));
+                        //当日用电量
+                        saveReqVO.setDailyPowerUsage(BigDecimal.valueOf(0.00));
+                        //非生产时间
+                        saveReqVO.setNonProductionTime(BigDecimal.valueOf(0.00));
+                        saveReqVO.setDeptId(vir.getDeptId());
+                        saveReqVO.setFillOrderCreateTime(LocalDateTime.now());
+                        iotRhDailyReportService.createIotRhDailyReport(saveReqVO);
                     }
                 }
-                //创建日报设备
-                List <IotOpeationFillDO> devList = opeationFillService.reportMethod(orderList1);
-                //插入日报设备
-                iotOpeationFillMapper.insertFill(devList);
             }
-
-
         }
 
 
 
+
         //发送钉钉通知
         pmsThreadPoolTaskExecutor.execute(()->{
             try{
@@ -355,7 +370,6 @@ public class IotOperationPlanJob implements JobHandler {
         }
         iotOpeationFillMapper.insertFill(deviceList);
 
-
     }
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/IotInfoServiceImpl.java

@@ -287,16 +287,13 @@ public class IotInfoServiceImpl implements IotInfoService {
                 for (JsonNode itemNode : rootNode) {
                     // 处理文件夹结构
                     JsonNode folderStructureNode = itemNode.get("folderStructure");
-                    JsonNode filesNode = itemNode.get("files");
-                    List<String> names = new ArrayList<>();
-                    for (JsonNode jsonNode : filesNode) {
-                        names.add(jsonNode.get("name").asText());
-                    }
                     Long fileClassId = null;
                     if (folderStructureNode != null) {
-                        fileClassId = processFolderStructure(folderStructureNode, parentId, deptId, deviceCode, deptName, names);
+                        fileClassId = processFolderStructure(folderStructureNode, parentId, deptId, deviceCode, deptName);
                     }
 
+                    // todo 处理文件
+                    JsonNode filesNode = itemNode.get("files");
                     if (filesNode != null && filesNode.isArray()&&Objects.nonNull(fileClassId)) {
                         processFiles(filesNode, parentId, fileClassId, deviceId, deptId, deviceCode, deptName);
                     }
@@ -356,7 +353,7 @@ public class IotInfoServiceImpl implements IotInfoService {
      * @param deptId 部门ID
      * @return 遇到包含"."的文件夹时返回其parentId，否则返回null
      */
-    private Long processFolderStructure(JsonNode folderStructureNode, Long parentId, Long deptId, String deviceCode, String deptName, List<String> names) {
+    private Long processFolderStructure(JsonNode folderStructureNode, Long parentId, Long deptId, String deviceCode, String deptName) {
         Iterator<String> fieldNames = folderStructureNode.fieldNames();
 
         while (fieldNames.hasNext()) {
@@ -364,11 +361,8 @@ public class IotInfoServiceImpl implements IotInfoService {
             JsonNode folderNode = folderStructureNode.get(folderName);
 
             // 检查文件夹名是否包含"."，如果是则返回当前parentId
-//            if (folderName.contains(".")) {
-//                return parentId; // 返回当前节点的父ID
-//            }
-            if (names.contains(folderName)) {
-                return parentId;
+            if (folderName.contains(".")) {
+                return parentId; // 返回当前节点的父ID
             }
 
             // 查询是否已存在同名同父节点的记录
@@ -395,7 +389,7 @@ public class IotInfoServiceImpl implements IotInfoService {
             JsonNode childrenNode = folderNode.get("children");
             if (childrenNode != null && !childrenNode.isNull() && !childrenNode.isEmpty()) {
                 // 递归调用，如果子节点处理中返回了parentId，则向上传递
-                Long result = processFolderStructure(childrenNode, currentNodeId, deptId, deviceCode, deptName, names);
+                Long result = processFolderStructure(childrenNode, currentNodeId, deptId, deviceCode, deptName);
                 if (result != null) {
                     return result; // 子节点处理中遇到了目标，返回结果
                 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrydailyreport/IotRyDailyReportServiceImpl.java

@@ -84,6 +84,7 @@ public class IotRyDailyReportServiceImpl implements IotRyDailyReportService {
             taskId = task.getId();
             // 根据日报状态 查询 日报所属任务的状态 瑞鹰任务状态数据字典 rigStatus
             if (ObjUtil.isNotEmpty(createReqVO.getRigStatus())) {
+                // ry任务施工状态 需要与 任务施工状态 匹配
                 task.setStatus(createReqVO.getRigStatus());
                 // 更新任务状态
                 iotProjectTaskMapper.updateById(task);

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/iotprojecttask/IotRhDailyReportMapper.xml

@@ -107,7 +107,7 @@
                     MIN(CASE WHEN construction_status = 1 THEN construction_start_date END)
             ) AS relocation_days
         FROM rq_iot_rh_daily_report
-        WHERE construction_status IN (1, 3)
+        WHERE construction_status IN ('dq', 'sg')
           AND deleted = 0
         GROUP BY dept_id;
     </select>

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/iotprojecttask/IotRyDailyReportMapper.xml

@@ -76,9 +76,9 @@
                 dept_id,
                 MAX(create_time) AS max_create_time
             FROM rq_iot_ry_daily_report
-            WHERE rig_status = 12
+            WHERE rig_status = 'wg'
             GROUP BY dept_id
         ) r2 ON r1.dept_id = r2.dept_id AND r1.create_time = r2.max_create_time
-        WHERE r1.rig_status = 12;
+        WHERE r1.rig_status = 'wg';
     </select>
 </mapper>