pms功能优化 保养工单 详情 功能优化

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

@@ -1,15 +1,21 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotmaintenancebom;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicerunlog.vo.IotDeviceRunLogRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaintenancebom.vo.IotMaintenanceBomPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaintenancebom.vo.IotMaintenanceBomRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmaintenancebom.vo.IotMaintenanceBomSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaintenancebom.IotMaintenanceBomDO;
+import cn.iocoder.yudao.module.pms.service.IotDeviceService;
+import cn.iocoder.yudao.module.pms.service.iotdevicerunlog.IotDeviceRunLogService;
 import cn.iocoder.yudao.module.pms.service.iotmaintenancebom.IotMaintenanceBomService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -22,10 +28,14 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertListByFlatMap;
 
 @Tag(name = "管理后台 - PMS 保养计划明细BOM")
 @RestController
@@ -35,6 +45,10 @@ public class IotMaintenanceBomController {
 
     @Resource
     private IotMaintenanceBomService iotMaintenanceBomService;
+    @Resource
+    private IotDeviceService iotDeviceService;
+    @Resource
+    private IotDeviceRunLogService iotDeviceRunLogService;
 
     @PostMapping("/create")
     @Operation(summary = "创建PMS 保养计划明细BOM")
@@ -77,6 +91,39 @@ public class IotMaintenanceBomController {
         return success(BeanUtils.toBean(pageResult, IotMaintenanceBomRespVO.class));
     }
 
+    @GetMapping("/getMainPlanBOMs")
+    @Operation(summary = "获得PMS 保养计划明细BOM列表")
+    @PreAuthorize("@ss.hasPermission('pms:iot-maintenance-bom:query')")
+    public CommonResult<List<IotMaintenanceBomRespVO>> getMainPlanBOMs(@Valid IotMaintenanceBomPageReqVO reqVO) {
+        List<IotMaintenanceBomDO> workOrderBOMs = iotMaintenanceBomService.getIotMainPlanBomList(reqVO);
+        // 组装bom关联的设备名称 编码
+        // 组装bom关联的设备 累计运行时间、累计运行公里数
+        return success(buildMainPlanBomList(workOrderBOMs));
+    }
+
+    private List<IotMaintenanceBomRespVO> buildMainPlanBomList(List<IotMaintenanceBomDO> BOMs) {
+        if (CollUtil.isEmpty(BOMs)) {
+            return Collections.emptyList();
+        }
+        // 组装bom关联的设备信息
+        Map<Long, IotDeviceRespVO> deviceMap = iotDeviceService.getDeviceMap(convertListByFlatMap(BOMs,
+                bom -> Stream.of(bom.getDeviceId())));
+        Map<Long, IotDeviceRunLogRespVO> deviceRunLogMap = iotDeviceRunLogService.getDeviceRunLogMap(convertListByFlatMap(BOMs,
+                bom -> Stream.of(bom.getDeviceId())));
+        // 2. 转换成 VO
+        return BeanUtils.toBean(BOMs, IotMaintenanceBomRespVO.class, bomVO -> {
+            // 设置设备相关信息
+            MapUtils.findAndThen(deviceMap, bomVO.getDeviceId(),
+                    device -> bomVO.setDeviceName(device.getDeviceName()));
+            MapUtils.findAndThen(deviceMap, bomVO.getDeviceId(),
+                    device -> bomVO.setDeviceCode(device.getDeviceCode()));
+            MapUtils.findAndThen(deviceRunLogMap, bomVO.getDeviceId(),
+                    device -> bomVO.setTotalMileage(device.getTotalMileage()));
+            MapUtils.findAndThen(deviceRunLogMap, bomVO.getDeviceId(),
+                    device -> bomVO.setTotalRunTime(device.getTotalRunTime()));
+        });
+    }
+
     @GetMapping("/deviceAssociateBomPage")
     @Operation(summary = "获得PMS 保养计划明细 设备关联-BOM分页")
     @PreAuthorize("@ss.hasPermission('pms:iot-maintenance-bom:query')")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmaintenancebom/vo/IotMaintenanceBomRespVO.java

@@ -142,5 +142,9 @@ public class IotMaintenanceBomRespVO {
     private String deviceStatus;
     @Schema(description = "资产性质")
     private String assetProperty;
+    @Schema(description = "累计运行时间", example = "30000H")
+    private BigDecimal totalRunTime;
+    @Schema(description = "累计运行公里数", example = "20238km")
+    private BigDecimal totalMileage;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorderbommaterial/vo/IotMainWorkOrderBomMaterialPageReqVO.java

@@ -51,6 +51,9 @@ public class IotMainWorkOrderBomMaterialPageReqVO extends PageParam {
     @Schema(description = "消耗数量")
     private BigDecimal quantity;
 
+    @Schema(description = "单位", example = "PC")
+    private String unit;
+
     @Schema(description = "单价(元)", example = "25019")
     private BigDecimal unitPrice;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorderbommaterial/vo/IotMainWorkOrderBomMaterialSaveReqVO.java

@@ -45,6 +45,9 @@ public class IotMainWorkOrderBomMaterialSaveReqVO {
     @Schema(description = "消耗数量")
     private BigDecimal quantity;
 
+    @Schema(description = "单位", example = "PC")
+    private String unit;
+
     @Schema(description = "单价(元)", example = "25019")
     private BigDecimal unitPrice;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotmainworkorderbommaterial/IotMainWorkOrderBomMaterialDO.java

@@ -72,6 +72,10 @@ public class IotMainWorkOrderBomMaterialDO extends BaseDO {
      * 消耗数量
      */
     private BigDecimal quantity;
+    /**
+     * 单价(元)
+     */
+    private String unit;
     /**
      * 单价(元)
      */

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

@@ -10,6 +10,8 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaintenancebom.IotMaintenanceBomDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * PMS 保养计划明细BOM Mapper
  *
@@ -55,4 +57,30 @@ public interface IotMaintenanceBomMapper extends BaseMapperX<IotMaintenanceBomDO
         return selectJoinPage(reqVO, IotMaintenanceBomDO.class, query);
     }
 
+    default List<IotMaintenanceBomDO> selectList(IotMaintenanceBomPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<IotMaintenanceBomDO>()
+                .eqIfPresent(IotMaintenanceBomDO::getPlanId, reqVO.getPlanId())
+                .eqIfPresent(IotMaintenanceBomDO::getPlanDetailId, reqVO.getPlanDetailId())
+                .eqIfPresent(IotMaintenanceBomDO::getDeviceCategoryId, reqVO.getDeviceCategoryId())
+                .eqIfPresent(IotMaintenanceBomDO::getDeviceId, reqVO.getDeviceId())
+                .eqIfPresent(IotMaintenanceBomDO::getRule, reqVO.getRule())
+                .betweenIfPresent(IotMaintenanceBomDO::getLastRunningTime, reqVO.getLastRunningTime())
+                .betweenIfPresent(IotMaintenanceBomDO::getNextRunningTime, reqVO.getNextRunningTime())
+                .eqIfPresent(IotMaintenanceBomDO::getLastRunningKilometers, reqVO.getLastRunningKilometers())
+                .eqIfPresent(IotMaintenanceBomDO::getNextRunningKilometers, reqVO.getNextRunningKilometers())
+                .betweenIfPresent(IotMaintenanceBomDO::getLastNaturalDate, reqVO.getLastNaturalDate())
+                .eqIfPresent(IotMaintenanceBomDO::getNextNaturalDate, reqVO.getNextNaturalDate())
+                .likeIfPresent(IotMaintenanceBomDO::getName, reqVO.getName())
+                .eqIfPresent(IotMaintenanceBomDO::getCode, reqVO.getCode())
+                .eqIfPresent(IotMaintenanceBomDO::getParentId, reqVO.getParentId())
+                .eqIfPresent(IotMaintenanceBomDO::getChildIds, reqVO.getChildIds())
+                .eqIfPresent(IotMaintenanceBomDO::getLevel, reqVO.getLevel())
+                .eqIfPresent(IotMaintenanceBomDO::getLeafFlag, reqVO.getLeafFlag())
+                .eqIfPresent(IotMaintenanceBomDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotMaintenanceBomDO::getType, reqVO.getType())
+                .eqIfPresent(IotMaintenanceBomDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotMaintenanceBomDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotMaintenanceBomDO::getVersion, reqVO.getVersion())
+                .betweenIfPresent(IotMaintenanceBomDO::getCreateTime, reqVO.getCreateTime()));
+    }
 }

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

@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorderbommaterial.vo.IotMainWorkOrderBomMaterialPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorderbommaterial.vo.IotMainWorkOrderBomMaterialRespVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmainworkorderbommaterial.IotMainWorkOrderBomMaterialDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.material.IotMaintainMaterialDO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -34,6 +33,7 @@ public interface IotMainWorkOrderBomMaterialMapper extends BaseMapperX<IotMainWo
                 .eqIfPresent(IotMainWorkOrderBomMaterialDO::getMaterialCode, reqVO.getMaterialCode())
                 .likeIfPresent(IotMainWorkOrderBomMaterialDO::getMaterialName, reqVO.getMaterialName())
                 .eqIfPresent(IotMainWorkOrderBomMaterialDO::getQuantity, reqVO.getQuantity())
+                .eqIfPresent(IotMainWorkOrderBomMaterialDO::getUnit, reqVO.getUnit())
                 .eqIfPresent(IotMainWorkOrderBomMaterialDO::getUnitPrice, reqVO.getUnitPrice())
                 .eqIfPresent(IotMainWorkOrderBomMaterialDO::getTotalPrice, reqVO.getTotalPrice())
                 .eqIfPresent(IotMainWorkOrderBomMaterialDO::getKilometerCycle, reqVO.getKilometerCycle())

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

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotmaintenancebom.vo.IotMain
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaintenancebom.IotMaintenanceBomDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * PMS 保养计划明细BOM Service 接口
@@ -60,4 +61,11 @@ public interface IotMaintenanceBomService {
      */
     PageResult<IotMaintenanceBomDO> deviceAssociateBomPage(IotMaintenanceBomPageReqVO pageReqVO);
 
+    /**
+     * 获得PMS 保养计划明细BOM列表
+     *
+     * @param reqVO 分页查询
+     * @return PMS 保养计划 明细 列表
+     */
+    List<IotMaintenanceBomDO> getIotMainPlanBomList(IotMaintenanceBomPageReqVO reqVO);
 }

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

@@ -11,6 +11,8 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.List;
+
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_MAINTENANCE_BOM_NOT_EXISTS;
 
@@ -73,4 +75,9 @@ public class IotMaintenanceBomServiceImpl implements IotMaintenanceBomService {
         return iotMaintenanceBomMapper.deviceAssociateBomPage(pageReqVO);
     }
 
+    @Override
+    public List<IotMaintenanceBomDO> getIotMainPlanBomList(IotMaintenanceBomPageReqVO reqVO) {
+        return iotMaintenanceBomMapper.selectList(reqVO);
+    }
+
 }

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

@@ -1,12 +1,9 @@
 package cn.iocoder.yudao.module.pms.service.iotmainworkorder;
 
-import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorder.vo.IotMainWorkOrderPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorder.vo.IotMainWorkOrderSaveReqVO;
@@ -25,10 +22,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -130,6 +125,7 @@ public class IotMainWorkOrderServiceImpl implements IotMainWorkOrderService {
         }
         // todo 保养工单 主表 还有 保养费用 、人工费用 、其他费用
         IotMainWorkOrderDO updateObj = BeanUtils.toBean(mainWorkOrder, IotMainWorkOrderDO.class);
+        updateObj.setResult(2);
         iotMainWorkOrderMapper.updateById(updateObj);
         // 保养工单明细
         List<IotMainWorkOrderBomDO> workOrderBomDOS = new ArrayList<>();