pms 瑞都 设备利用率 压裂 连油 主设备

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/ErrorCodeConstant.java

@@ -112,5 +112,6 @@ public interface ErrorCodeConstant{
     ErrorCode IOT_WEBTOPO_PROJECT_NOT_EXISTS = new ErrorCode(286, "组态项目列不存在");
     ErrorCode IOT_WEBTOPO_DEVICE_SVGNODE_NOT_EXISTS = new ErrorCode(287, "组态-svg与设备绑定不存在");
     ErrorCode IOT_WEBTOPO_PROJECT_DEVICE_NOT_EXISTS = new ErrorCode(288, "组态项目关联设备不存在");
-    ErrorCode IOT_WEBTOPO_DEVICE_SVGNODE_EXISTS = new ErrorCode(287, "组态-svg与设备绑定已经存在");
+    ErrorCode IOT_WEBTOPO_DEVICE_SVGNODE_EXISTS = new ErrorCode(290, "组态-svg与设备绑定已经存在");
+    ErrorCode IOT_DEVICE_ASSOCIATE_NOT_EXISTS = new ErrorCode(289, "设备关联表(如：瑞都主要设备)不存在");
 }

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

@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate;
+
+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.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate.vo.IotDeviceAssociatePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate.vo.IotDeviceAssociateRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate.vo.IotDeviceAssociateSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceassociate.IotDeviceAssociateDO;
+import cn.iocoder.yudao.module.pms.service.iotdeviceassociate.IotDeviceAssociateService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 设备关联表(如：瑞都主要设备)")
+@RestController
+@RequestMapping("/pms/iot-device-associate")
+@Validated
+public class IotDeviceAssociateController {
+
+    @Resource
+    private IotDeviceAssociateService iotDeviceAssociateService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建设备关联表(如：瑞都主要设备)")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-associate:create')")
+    public CommonResult<Long> createIotDeviceAssociate(@Valid @RequestBody IotDeviceAssociateSaveReqVO createReqVO) {
+        return success(iotDeviceAssociateService.createIotDeviceAssociate(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新设备关联表(如：瑞都主要设备)")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-associate:update')")
+    public CommonResult<Boolean> updateIotDeviceAssociate(@Valid @RequestBody IotDeviceAssociateSaveReqVO updateReqVO) {
+        iotDeviceAssociateService.updateIotDeviceAssociate(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除设备关联表(如：瑞都主要设备)")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-associate:delete')")
+    public CommonResult<Boolean> deleteIotDeviceAssociate(@RequestParam("id") Long id) {
+        iotDeviceAssociateService.deleteIotDeviceAssociate(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得设备关联表(如：瑞都主要设备)")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-associate:query')")
+    public CommonResult<IotDeviceAssociateRespVO> getIotDeviceAssociate(@RequestParam("id") Long id) {
+        IotDeviceAssociateDO iotDeviceAssociate = iotDeviceAssociateService.getIotDeviceAssociate(id);
+        return success(BeanUtils.toBean(iotDeviceAssociate, IotDeviceAssociateRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得设备关联表(如：瑞都主要设备)分页")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-associate:query')")
+    public CommonResult<PageResult<IotDeviceAssociateRespVO>> getIotDeviceAssociatePage(@Valid IotDeviceAssociatePageReqVO pageReqVO) {
+        PageResult<IotDeviceAssociateDO> pageResult = iotDeviceAssociateService.getIotDeviceAssociatePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotDeviceAssociateRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出设备关联表(如：瑞都主要设备) Excel")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-associate:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotDeviceAssociateExcel(@Valid IotDeviceAssociatePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotDeviceAssociateDO> list = iotDeviceAssociateService.getIotDeviceAssociatePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "设备关联表(如：瑞都主要设备).xls", "数据", IotDeviceAssociateRespVO.class,
+                        BeanUtils.toBean(list, IotDeviceAssociateRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdeviceassociate/vo/IotDeviceAssociatePageReqVO.java

@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 设备关联表(如：瑞都主要设备)分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotDeviceAssociatePageReqVO extends PageParam {
+
+    @Schema(description = "部门id", example = "32288")
+    private Long deptId;
+
+    @Schema(description = "设备id", example = "16037")
+    private Long deviceId;
+
+    @Schema(description = "类别(设备利用率...)", example = "2")
+    private String type;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态", example = "2")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "部门id", example = "16037")
+    private Collection<Long> deptIds;
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdeviceassociate/vo/IotDeviceAssociateRespVO.java

@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 设备关联表(如：瑞都主要设备) Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotDeviceAssociateRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14875")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "部门id", example = "32288")
+    @ExcelProperty("部门id")
+    private Long deptId;
+
+    @Schema(description = "设备id", example = "16037")
+    @ExcelProperty("设备id")
+    private Long deviceId;
+
+    @Schema(description = "类别(设备利用率...)", example = "2")
+    @ExcelProperty("类别(设备利用率...)")
+    private String type;
+
+    @Schema(description = "备注", example = "你说的对")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态", example = "2")
+    @ExcelProperty("状态")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdeviceassociate/vo/IotDeviceAssociateSaveReqVO.java

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 设备关联表(如：瑞都主要设备)新增/修改 Request VO")
+@Data
+public class IotDeviceAssociateSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14875")
+    private Long id;
+
+    @Schema(description = "部门id", example = "32288")
+    private Long deptId;
+
+    @Schema(description = "设备id", example = "16037")
+    private Long deviceId;
+
+    @Schema(description = "类别(设备利用率...)", example = "2")
+    private String type;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "状态", example = "2")
+    private Integer status;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotdeviceassociate/IotDeviceAssociateDO.java

@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceassociate;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 设备关联表(如：瑞都主要设备) DO
+ *
+ * @author ruiqi
+ */
+@TableName("rq_iot_device_associate")
+@KeySequence("rq_iot_device_associate_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotDeviceAssociateDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+    /**
+     * 类别(设备利用率...)
+     */
+    private String type;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态
+     */
+    private Integer status;
+
+}

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

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotdeviceassociate;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate.vo.IotDeviceAssociatePageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceassociate.IotDeviceAssociateDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 设备关联表(如：瑞都主要设备) Mapper
+ *
+ * @author ruiqi
+ */
+@Mapper
+public interface IotDeviceAssociateMapper extends BaseMapperX<IotDeviceAssociateDO> {
+
+    default PageResult<IotDeviceAssociateDO> selectPage(IotDeviceAssociatePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotDeviceAssociateDO>()
+                .eqIfPresent(IotDeviceAssociateDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotDeviceAssociateDO::getDeptId, reqVO.getDeptIds())
+                .eqIfPresent(IotDeviceAssociateDO::getDeviceId, reqVO.getDeviceId())
+                .eqIfPresent(IotDeviceAssociateDO::getType, reqVO.getType())
+                .eqIfPresent(IotDeviceAssociateDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotDeviceAssociateDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(IotDeviceAssociateDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotDeviceAssociateDO::getId));
+    }
+
+}

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

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.pms.service.iotdeviceassociate;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate.vo.IotDeviceAssociatePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate.vo.IotDeviceAssociateSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceassociate.IotDeviceAssociateDO;
+
+import javax.validation.Valid;
+
+/**
+ * 设备关联表(如：瑞都主要设备) Service 接口
+ *
+ * @author ruiqi
+ */
+public interface IotDeviceAssociateService {
+
+    /**
+     * 创建设备关联表(如：瑞都主要设备)
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotDeviceAssociate(@Valid IotDeviceAssociateSaveReqVO createReqVO);
+
+    /**
+     * 更新设备关联表(如：瑞都主要设备)
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotDeviceAssociate(@Valid IotDeviceAssociateSaveReqVO updateReqVO);
+
+    /**
+     * 删除设备关联表(如：瑞都主要设备)
+     *
+     * @param id 编号
+     */
+    void deleteIotDeviceAssociate(Long id);
+
+    /**
+     * 获得设备关联表(如：瑞都主要设备)
+     *
+     * @param id 编号
+     * @return 设备关联表(如：瑞都主要设备)
+     */
+    IotDeviceAssociateDO getIotDeviceAssociate(Long id);
+
+    /**
+     * 获得设备关联表(如：瑞都主要设备)分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 设备关联表(如：瑞都主要设备)分页
+     */
+    PageResult<IotDeviceAssociateDO> getIotDeviceAssociatePage(IotDeviceAssociatePageReqVO pageReqVO);
+
+}

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

@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.pms.service.iotdeviceassociate;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate.vo.IotDeviceAssociatePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate.vo.IotDeviceAssociateSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceassociate.IotDeviceAssociateDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotdeviceassociate.IotDeviceAssociateMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_DEVICE_ASSOCIATE_NOT_EXISTS;
+
+/**
+ * 设备关联表(如：瑞都主要设备) Service 实现类
+ *
+ * @author ruiqi
+ */
+@Service
+@Validated
+public class IotDeviceAssociateServiceImpl implements IotDeviceAssociateService {
+
+    @Resource
+    private IotDeviceAssociateMapper iotDeviceAssociateMapper;
+
+    @Override
+    public Long createIotDeviceAssociate(IotDeviceAssociateSaveReqVO createReqVO) {
+        // 插入
+        IotDeviceAssociateDO iotDeviceAssociate = BeanUtils.toBean(createReqVO, IotDeviceAssociateDO.class);
+        iotDeviceAssociateMapper.insert(iotDeviceAssociate);
+        // 返回
+        return iotDeviceAssociate.getId();
+    }
+
+    @Override
+    public void updateIotDeviceAssociate(IotDeviceAssociateSaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotDeviceAssociateExists(updateReqVO.getId());
+        // 更新
+        IotDeviceAssociateDO updateObj = BeanUtils.toBean(updateReqVO, IotDeviceAssociateDO.class);
+        iotDeviceAssociateMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotDeviceAssociate(Long id) {
+        // 校验存在
+        validateIotDeviceAssociateExists(id);
+        // 删除
+        iotDeviceAssociateMapper.deleteById(id);
+    }
+
+    private void validateIotDeviceAssociateExists(Long id) {
+        if (iotDeviceAssociateMapper.selectById(id) == null) {
+            throw exception(IOT_DEVICE_ASSOCIATE_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public IotDeviceAssociateDO getIotDeviceAssociate(Long id) {
+        return iotDeviceAssociateMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotDeviceAssociateDO> getIotDeviceAssociatePage(IotDeviceAssociatePageReqVO pageReqVO) {
+        return iotDeviceAssociateMapper.selectPage(pageReqVO);
+    }
+
+}

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

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils;
@@ -12,6 +13,7 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.pms.constant.PmsConstants;
 import cn.iocoder.yudao.module.pms.controller.admin.iotattachment.vo.IotAttachmentSaveReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdailyreportfuel.vo.IotDailyReportFuelSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceassociate.vo.IotDeviceAssociatePageReqVO;
 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.iotrddailyreport.vo.*;
@@ -22,6 +24,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotattachment.IotAttachmentDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdailyreportfuel.IotDailyReportFuelDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceassociate.IotDeviceAssociateDO;
 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.iotprojecttaskattrs.IotTaskAttrModelProperty;
@@ -31,6 +34,7 @@ import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotProductClassifyMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotattachment.IotAttachmentMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotdailyreportfuel.IotDailyReportFuelMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotdeviceassociate.IotDeviceAssociateMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotprojectinfo.IotProjectInfoMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotprojecttask.IotProjectTaskMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotrddailyreport.IotRdDailyReportMapper;
@@ -122,6 +126,8 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
     private IotProductClassifyMapper iotProductClassifyMapper;
     @Resource
     private IotRdDailyReportDetailMapper iotRdDailyReportDetailMapper;
+    @Resource
+    private IotDeviceAssociateMapper iotDeviceAssociateMapper;
 
     @Override
     public Long createIotRdDailyReport(IotRdDailyReportSaveReqVO createReqVO) {
@@ -1469,6 +1475,25 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
         // key项目部id   value A+B类设备id集合
         Map<Long, Set<Long>> projectABDeviceIdPair = new HashMap<>();
 
+        // 设备利用率逻辑调整 只筛选 压裂 连油 主设备 rq_iot_device_associate
+        // 队伍日报中关联的主设备数量 /（队伍下所有主设备数量-封存设备数量）
+        Set<Long> mainDeviceIds = new HashSet<>();
+        Set<Long> fcMainDeviceIds = new HashSet<>();
+        // key设备id   value设备所属部门id
+        Map<Long, Long> mainDeviceIdPair = new HashMap<>();
+        IotDeviceAssociatePageReqVO deviceAssocReqVO = new IotDeviceAssociatePageReqVO();
+        deviceAssocReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        deviceAssocReqVO.setDeptIds(allRhChildDeptIds);
+        PageResult<IotDeviceAssociateDO> pageResult = iotDeviceAssociateMapper.selectPage(deviceAssocReqVO);
+        if (ObjUtil.isNotEmpty(pageResult)) {
+            List<IotDeviceAssociateDO> deviceAssociates = pageResult.getList();
+            // 查询出所有瑞都压裂 连油主设备
+            deviceAssociates.forEach(assoc -> {
+                mainDeviceIds.add(assoc.getDeviceId());
+                mainDeviceIdPair.put(assoc.getDeviceId(), assoc.getDeptId());
+            });
+        }
+
         // 以项目部为维度统计 设备利用率 日报中用到AB类设备/
         // 瑞都 A B 类设备id 集合
         Set<Long> abDeviceCategoryIds = new HashSet<>();
@@ -1493,28 +1518,39 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
             });
         }
 
-        // 查询瑞都所有设备
+        // 查询瑞都 压裂 连油 主设备详情信息
         IotDevicePageReqVO deviceReqVO = new IotDevicePageReqVO();
-        deviceReqVO.setDeptIds(new ArrayList<>(allRhChildDeptIds));
-        List<IotDeviceDO> rdDevices = iotDeviceMapper.selectListAlone(deviceReqVO);
-        // 筛选每个项目部 A B 类设备id集合
-        if (CollUtil.isNotEmpty(rdDevices)) {
-            rdDevices.forEach(device -> {
-                Long projectId = 0l;
-                if (teamProjectIdPair.containsKey(device.getDeptId())) {
-                    projectId = teamProjectIdPair.get(device.getDeptId());
+        deviceReqVO.setDeviceIds(new ArrayList<>(mainDeviceIds));
+        List<IotDeviceDO> mainDevices = iotDeviceMapper.selectListAlone(deviceReqVO);
+        // 筛选出 封存 的主设备
+        if (CollUtil.isNotEmpty(mainDevices)) {
+            mainDevices.forEach(device -> {
+                if ("fc".equals(device.getDeviceStatus())) {
+                    fcMainDeviceIds.add(device.getId());
                 }
-                if (projectDeptIds.contains(device.getDeptId())) {
-                    projectId = device.getDeptId();
-                }
-                if (abDeviceCategoryIds.contains(device.getAssetClass())) {
+            });
+        }
+
+        // 设置各项目部 压裂 连油 主设备集合
+        if (CollUtil.isNotEmpty(mainDeviceIdPair)) {
+            // key主设备id  value主设备所属部门id
+            mainDeviceIdPair.forEach((deviceId, deptId) -> {
+                // 过滤掉封存的压裂 连油主设备
+                if (!fcMainDeviceIds.contains(deviceId)) {
+                    Long projectId = 0l;
+                    if (teamProjectIdPair.containsKey(deptId)) {
+                        projectId = teamProjectIdPair.get(deptId);
+                    }
+                    if (projectDeptIds.contains(deptId)) {
+                        projectId = deptId;
+                    }
                     if (projectABDeviceIdPair.containsKey(projectId)) {
                         Set<Long> tempDeviceIds = projectABDeviceIdPair.get(projectId);
-                        tempDeviceIds.add(device.getId());
+                        tempDeviceIds.add(deviceId);
                         projectABDeviceIdPair.put(projectId, tempDeviceIds);
                     } else {
                         Set<Long> tempDeviceIds = new HashSet<>();
-                        tempDeviceIds.add(device.getId());
+                        tempDeviceIds.add(deviceId);
                         projectABDeviceIdPair.put(projectId, tempDeviceIds);
                     }
                 }
@@ -1525,32 +1561,34 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
         if (CollUtil.isNotEmpty(dailyReports)) {
             dailyReports.forEach(report -> {
                 // 统计日报包含施工AB类设备的利用率
-                if (lyStatuses.contains(report.getRdStatus())) {
-                    Set<Long> reportDeviceIds = report.getDeviceIds();
-                    // 获得当前日报施工队伍的上级项目部
-                    if (teamProjectIdPair.containsKey(report.getDeptId())) {
-                        Long projectId = teamProjectIdPair.get(report.getDeptId());
-                        if (projectABDeviceIdPair.containsKey(projectId)) {
-                            // 项目部下所有的AB类设备id集合
-                            Set<Long> tempReportDeviceIds = projectABDeviceIdPair.get(projectId);
-                            Set<Long> crossDeviceIds = CollUtil.isNotEmpty(reportDeviceIds)
-                                    && CollUtil.isNotEmpty(tempReportDeviceIds)
-                                    ? reportDeviceIds.stream() // 流式处理reportDeviceIds
-                                    .filter(tempReportDeviceIds::contains) // 筛选出在tempReportDeviceIds中存在的元素
-                                    .collect(Collectors.toSet()) // 收集为新的Set集合
-                                    : Collections.emptySet(); // 任意集合为空则返回空Set（避免返回null）
-                            if (projectReportABDeviceIdPair.containsKey(projectId)) {
-                                Set<Long> tempDeviceIds = projectReportABDeviceIdPair.get(projectId);
-                                tempDeviceIds.addAll(crossDeviceIds);
-                                projectReportABDeviceIdPair.put(projectId, tempDeviceIds);
-                            } else {
-                                Set<Long> tempDeviceIds = new HashSet<>();
-                                tempDeviceIds.addAll(crossDeviceIds);
-                                projectReportABDeviceIdPair.put(projectId, tempDeviceIds);
-                            }
+                // 利用率暂时不考虑日报状态
+                // if (lyStatuses.contains(report.getRdStatus())) {
+                Set<Long> reportDeviceIds = report.getDeviceIds();
+                // 获得当前日报施工队伍的上级项目部
+                if (teamProjectIdPair.containsKey(report.getDeptId())) {
+                    Long projectId = teamProjectIdPair.get(report.getDeptId());
+                    if (projectABDeviceIdPair.containsKey(projectId)) {
+                        // 项目部下所有的AB类设备id集合
+                        Set<Long> tempReportDeviceIds = projectABDeviceIdPair.get(projectId);
+                        Set<Long> crossDeviceIds = CollUtil.isNotEmpty(reportDeviceIds)
+                                && CollUtil.isNotEmpty(tempReportDeviceIds)
+                                ? reportDeviceIds.stream() // 流式处理reportDeviceIds
+                                .filter(tempReportDeviceIds::contains) // 筛选出在tempReportDeviceIds中存在的元素
+                                .filter(deviceId -> !fcMainDeviceIds.contains(deviceId)) // 过滤掉 封存的主设备
+                                .collect(Collectors.toSet()) // 收集为新的Set集合
+                                : Collections.emptySet(); // 任意集合为空则返回空Set（避免返回null）
+                        if (projectReportABDeviceIdPair.containsKey(projectId)) {
+                            Set<Long> tempDeviceIds = projectReportABDeviceIdPair.get(projectId);
+                            tempDeviceIds.addAll(crossDeviceIds);
+                            projectReportABDeviceIdPair.put(projectId, tempDeviceIds);
+                        } else {
+                            Set<Long> tempDeviceIds = new HashSet<>();
+                            tempDeviceIds.addAll(crossDeviceIds);
+                            projectReportABDeviceIdPair.put(projectId, tempDeviceIds);
                         }
                     }
                 }
+                // }
 
                 BigDecimal dailyFuel = report.getDailyFuel();
                 dailyFuel = ObjUtil.isEmpty(dailyFuel) ? BigDecimal.ZERO : dailyFuel;
@@ -1716,11 +1754,12 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
                 }
             });
             // 计算每个项目部的设备利用率 施工的设备数量/设备总数量
+            // 队伍日报中关联的主设备数量/(队伍下所有主设备数量-封存设备数量)
             if (CollUtil.isNotEmpty(projectABDeviceIdPair)) {
                 projectABDeviceIdPair.forEach((projectDeptId, deviceIds) -> {
-                    // 项目部下所有AB类设备
+                    // 项目部下所有压裂连油主设备
                     Integer projectDeviceCount = deviceIds.size();
-                    // 项目部日报中施工的AB类设备
+                    // 项目部日报中施工的压裂连油主设备
                     Integer reportDeviceCount = 0;
                     if (projectReportABDeviceIdPair.containsKey(projectDeptId)) {
                         Set<Long> reportDeviceIds = projectReportABDeviceIdPair.get(projectDeptId);
@@ -1867,25 +1906,55 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
         // key队伍id   value A+B类设备id集合
         Map<Long, Set<Long>> teamABDeviceIdPair = new HashMap<>();
 
-        // 查询瑞都所有设备
+        // 设备利用率逻辑调整 只筛选 压裂 连油 主设备 rq_iot_device_associate
+        // 队伍日报中关联的主设备数量 /（队伍下所有主设备数量-封存设备数量）
+        Set<Long> mainDeviceIds = new HashSet<>();
+        Set<Long> fcMainDeviceIds = new HashSet<>();
+        // key设备id   value设备所属部门id
+        Map<Long, Long> mainDeviceIdPair = new HashMap<>();
+        IotDeviceAssociatePageReqVO deviceAssocReqVO = new IotDeviceAssociatePageReqVO();
+        deviceAssocReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        deviceAssocReqVO.setDeptIds(allRhChildDeptIds);
+        PageResult<IotDeviceAssociateDO> pageResult = iotDeviceAssociateMapper.selectPage(deviceAssocReqVO);
+        if (ObjUtil.isNotEmpty(pageResult)) {
+            List<IotDeviceAssociateDO> deviceAssociates = pageResult.getList();
+            // 查询出所有瑞都压裂 连油主设备
+            deviceAssociates.forEach(assoc -> {
+                // 过滤掉封存的设备
+                mainDeviceIds.add(assoc.getDeviceId());
+                mainDeviceIdPair.put(assoc.getDeviceId(), assoc.getDeptId());
+            });
+        }
+
+        // 查询瑞都 压裂 连油 主设备详情信息
         IotDevicePageReqVO deviceReqVO = new IotDevicePageReqVO();
-        deviceReqVO.setDeptIds(new ArrayList<>(allRhChildDeptIds));
-        List<IotDeviceDO> rdDevices = iotDeviceMapper.selectListAlone(deviceReqVO);
-        // 筛选每个项目部 A B 类设备id集合
-        if (CollUtil.isNotEmpty(rdDevices)) {
-            rdDevices.forEach(device -> {
-                Long teamId = 0l;
-                if (teamDeptIds.contains(device.getDeptId())) {
-                    teamId = device.getDeptId();
+        deviceReqVO.setDeviceIds(new ArrayList<>(mainDeviceIds));
+        List<IotDeviceDO> mainDevices = iotDeviceMapper.selectListAlone(deviceReqVO);
+        // 筛选出 封存 的主设备
+        if (CollUtil.isNotEmpty(mainDevices)) {
+            mainDevices.forEach(device -> {
+                if ("fc".equals(device.getDeviceStatus())) {
+                    fcMainDeviceIds.add(device.getId());
                 }
-                if (abDeviceCategoryIds.contains(device.getAssetClass())) {
+            });
+        }
+
+        // 筛选每个项目部 压裂 连油 主设备id集合
+        if (CollUtil.isNotEmpty(mainDeviceIdPair)) {
+            mainDeviceIdPair.forEach((deviceId, departmentId) -> {
+                // 过滤掉封存的压裂 连油主设备
+                if (!fcMainDeviceIds.contains(deviceId)) {
+                    Long teamId = 0l;
+                    if (teamDeptIds.contains(departmentId)) {
+                        teamId = departmentId;
+                    }
                     if (teamABDeviceIdPair.containsKey(teamId)) {
                         Set<Long> tempDeviceIds = teamABDeviceIdPair.get(teamId);
-                        tempDeviceIds.add(device.getId());
+                        tempDeviceIds.add(deviceId);
                         teamABDeviceIdPair.put(teamId, tempDeviceIds);
                     } else {
                         Set<Long> tempDeviceIds = new HashSet<>();
-                        tempDeviceIds.add(device.getId());
+                        tempDeviceIds.add(deviceId);
                         teamABDeviceIdPair.put(teamId, tempDeviceIds);
                     }
                 }
@@ -1896,29 +1965,27 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
         if (CollUtil.isNotEmpty(dailyReports)) {
             dailyReports.forEach(report -> {
                 // 统计日报关联施工AB类设备的利用率
-                // 统计日报包含施工AB类设备的利用率
-                if (lyStatuses.contains(report.getRdStatus())) {
-                    Set<Long> reportDeviceIds = report.getDeviceIds();
-                    // 获得当前日报施工队伍的上级项目部
-                    if (teamDeptIds.contains(report.getDeptId())) {
-                        if (teamABDeviceIdPair.containsKey(report.getDeptId())) {
-                            // 下所有的AB类设备id集合
-                            Set<Long> tempReportDeviceIds = teamABDeviceIdPair.get(report.getDeptId());
-                            Set<Long> crossDeviceIds = CollUtil.isNotEmpty(reportDeviceIds)
-                                    && CollUtil.isNotEmpty(tempReportDeviceIds)
-                                    ? reportDeviceIds.stream() // 流式处理reportDeviceIds
-                                    .filter(tempReportDeviceIds::contains) // 筛选出在tempReportDeviceIds中存在的元素
-                                    .collect(Collectors.toSet()) // 收集为新的Set集合
-                                    : Collections.emptySet(); // 任意集合为空则返回空Set（避免返回null）
-                            if (teamReportABDeviceIdPair.containsKey(report.getDeptId())) {
-                                Set<Long> tempDeviceIds = teamReportABDeviceIdPair.get(report.getDeptId());
-                                tempDeviceIds.addAll(crossDeviceIds);
-                                teamReportABDeviceIdPair.put(report.getDeptId(), tempDeviceIds);
-                            } else {
-                                Set<Long> tempDeviceIds = new HashSet<>();
-                                tempDeviceIds.addAll(crossDeviceIds);
-                                teamReportABDeviceIdPair.put(report.getDeptId(), tempDeviceIds);
-                            }
+                Set<Long> reportDeviceIds = report.getDeviceIds();
+                // 获得当前日报施工队伍的上级项目部
+                if (teamDeptIds.contains(report.getDeptId())) {
+                    if (teamABDeviceIdPair.containsKey(report.getDeptId())) {
+                        // 下所有的AB类设备id集合
+                        Set<Long> tempReportDeviceIds = teamABDeviceIdPair.get(report.getDeptId());
+                        Set<Long> crossDeviceIds = CollUtil.isNotEmpty(reportDeviceIds)
+                                && CollUtil.isNotEmpty(tempReportDeviceIds)
+                                ? reportDeviceIds.stream() // 流式处理reportDeviceIds
+                                .filter(tempReportDeviceIds::contains) // 筛选出在tempReportDeviceIds中存在的元素
+                                .filter(deviceId -> !fcMainDeviceIds.contains(deviceId)) // 过滤掉 封存的主设备
+                                .collect(Collectors.toSet()) // 收集为新的Set集合
+                                : Collections.emptySet(); // 任意集合为空则返回空Set（避免返回null）
+                        if (teamReportABDeviceIdPair.containsKey(report.getDeptId())) {
+                            Set<Long> tempDeviceIds = teamReportABDeviceIdPair.get(report.getDeptId());
+                            tempDeviceIds.addAll(crossDeviceIds);
+                            teamReportABDeviceIdPair.put(report.getDeptId(), tempDeviceIds);
+                        } else {
+                            Set<Long> tempDeviceIds = new HashSet<>();
+                            tempDeviceIds.addAll(crossDeviceIds);
+                            teamReportABDeviceIdPair.put(report.getDeptId(), tempDeviceIds);
                         }
                     }
                 }