Merge remote-tracking branch 'origin/master'

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

@@ -1,15 +1,18 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 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.iotdevicebom.vo.IotDeviceBomPageReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom.vo.IotDeviceBomRespVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom.vo.IotDeviceBomSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom.vo.*;
+import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialgroup.vo.IotMaterialGroupListReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialgroup.vo.IotMaterialGroupRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialgroup.vo.MaterialGroupSimpleRespVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicebom.IotDeviceBomDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialgroup.IotMaterialGroupDO;
 import cn.iocoder.yudao.module.pms.service.iotdevicebom.IotDeviceBomService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -77,6 +80,22 @@ public class IotDeviceBomController {
         return success(BeanUtils.toBean(pageResult, IotDeviceBomRespVO.class));
     }
 
+    @GetMapping(value = {"/list-all-simple", "/simple-list"})
+    @Operation(summary = "获取 设备BOM树 精简信息列表", description = "只包含被开启的BOM树节点，主要用于前端的下拉选项")
+    public CommonResult<List<IotDeviceBomSimpleRespVO>> getSimpleDeviceBomList() {
+        List<IotDeviceBomDO> list = iotDeviceBomService.getDeviceBomList(
+                new IotDeviceBomListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus()));
+        return success(BeanUtils.toBean(list, IotDeviceBomSimpleRespVO.class));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获取 设备BOM 列表 树")
+    @PreAuthorize("@ss.hasPermission('rq:iot-material-group:query')")
+    public CommonResult<List<IotDeviceBomRespVO>> getDeviceBomList(IotDeviceBomListReqVO reqVO) {
+        List<IotDeviceBomDO> list = iotDeviceBomService.getDeviceBomList(reqVO);
+        return success(BeanUtils.toBean(list, IotDeviceBomRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出PMS 设备BOM 关系 Excel")
     @PreAuthorize("@ss.hasPermission('pms:iot-device-bom:export')")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicebom/vo/IotDeviceBomListReqVO.java

@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 设备BOM 列表 Request VO")
+@Data
+public class IotDeviceBomListReqVO {
+
+    @Schema(description = "设备bom节点 名称，模糊匹配", example = "pms")
+    private Long deviceId;
+
+    @Schema(description = "设备bom节点 名称，模糊匹配", example = "pms")
+    private String name;
+
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
+    private Integer status;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicebom/vo/IotDeviceBomSimpleRespVO.java

@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Schema(description = "管理后台 - 设备BOM 精简信息 Response VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotDeviceBomSimpleRespVO {
+
+    @Schema(description = "设备BOM编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+
+    @Schema(description = "设备BOM名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "pms")
+    private String name;
+
+    @Schema(description = "父设备BOM ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long parentId;
+
+}

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

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate;
 
+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;
@@ -10,8 +11,13 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.DeviceT
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.IotDeviceTemplatePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.IotDeviceTemplateRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.IotDeviceTemplateSaveReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotmaterial.vo.MaterialUpdateStatusReqVO;
+import cn.iocoder.yudao.module.pms.convert.iotdevicetemplate.IotDeviceTemplateConvert;
+import cn.iocoder.yudao.module.pms.convert.iotmaterial.IotMaterialConvert;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicetemplate.IotDeviceTemplateDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterial.IotMaterialDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialgroup.IotMaterialGroupDO;
+import cn.iocoder.yudao.module.pms.service.IotProductClassifyService;
 import cn.iocoder.yudao.module.pms.service.iotdevicetemplate.IotDeviceTemplateService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -25,9 +31,11 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 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.convertList;
 
 @Tag(name = "管理后台 - PMS 功能优化 设备模板")
 @RestController
@@ -37,6 +45,8 @@ public class IotDeviceTemplateController {
 
     @Resource
     private IotDeviceTemplateService iotDeviceTemplateService;
+    @Resource
+    private IotProductClassifyService iotProductClassifyService;
 
     @PostMapping("/create")
     @Operation(summary = "创建PMS 功能优化 设备模板")
@@ -84,7 +94,14 @@ public class IotDeviceTemplateController {
     @PreAuthorize("@ss.hasPermission('rq:iot-device-template:query')")
     public CommonResult<PageResult<IotDeviceTemplateRespVO>> getIotDeviceTemplatePage(@Valid IotDeviceTemplatePageReqVO pageReqVO) {
         PageResult<IotDeviceTemplateDO> pageResult = iotDeviceTemplateService.getIotDeviceTemplatePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, IotDeviceTemplateRespVO.class));
+        if (CollUtil.isEmpty(pageResult.getList())) {
+            return success(new PageResult<>(pageResult.getTotal()));
+        }
+        // 拼接所属 设备分类
+        Map<Long, IotProductClassifyDO> deviceCategoryMap = iotProductClassifyService.getIotProductClassifyMap(
+                convertList(pageResult.getList(), IotDeviceTemplateDO::getDeviceCategoryId));
+        return success(new PageResult<>(IotDeviceTemplateConvert.INSTANCE.convertList(pageResult.getList(), deviceCategoryMap),
+                pageResult.getTotal()));
     }
 
     @GetMapping("/list-by-device-category-id")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicetemplate/vo/IotDeviceTemplateRespVO.java

@@ -22,6 +22,10 @@ public class IotDeviceTemplateRespVO {
     @ExcelProperty("所属设备分类")
     private Long deviceCategoryId;
 
+    @Schema(description = "所属设备分类名称", example = "pms")
+    @ExcelProperty("所属设备分类名称")
+    private String deviceCategoryName;
+
     @Schema(description = "模板名称", example = "赵六")
     @ExcelProperty("模板名称")
     private String name;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/convert/iotdevicetemplate/IotDeviceTemplateConvert.java

@@ -1,7 +1,11 @@
 package cn.iocoder.yudao.module.pms.convert.iotdevicetemplate;
 
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.model.DeviceTemplateAttrs;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.IotDeviceTemplateRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.IotDeviceTemplateSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicetemplate.IotDeviceTemplateDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -9,6 +13,7 @@ import org.mapstruct.Named;
 import org.mapstruct.factory.Mappers;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface IotDeviceTemplateConvert {
@@ -23,4 +28,16 @@ public interface IotDeviceTemplateConvert {
         return bean.getAttrs();
     }
 
+    default List<IotDeviceTemplateRespVO> convertList(List<IotDeviceTemplateDO> list, Map<Long, IotProductClassifyDO> productClassifyMap) {
+        return CollectionUtils.convertList(list, template -> convert(template, productClassifyMap.get(template.getDeviceCategoryId())));
+    }
+
+    default IotDeviceTemplateRespVO convert(IotDeviceTemplateDO template, IotProductClassifyDO deviceCategory) {
+        IotDeviceTemplateRespVO templateVO = BeanUtils.toBean(template, IotDeviceTemplateRespVO.class);
+        if (deviceCategory != null) {
+            templateVO.setDeviceCategoryName(deviceCategory.getName());
+        }
+        return templateVO;
+    }
+
 }

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

@@ -3,10 +3,15 @@ package cn.iocoder.yudao.module.pms.dal.mysql.iotdevicebom;
 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.iotdevicebom.vo.IotDeviceBomListReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom.vo.IotDeviceBomPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotmaterialgroup.vo.IotMaterialGroupListReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicebom.IotDeviceBomDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialgroup.IotMaterialGroupDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * PMS 设备BOM 关系 Mapper
  *
@@ -34,4 +39,11 @@ public interface IotDeviceBomMapper extends BaseMapperX<IotDeviceBomDO> {
                 .orderByDesc(IotDeviceBomDO::getId));
     }
 
+    default List<IotDeviceBomDO> selectList(IotDeviceBomListReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<IotDeviceBomDO>()
+                .likeIfPresent(IotDeviceBomDO::getName, reqVO.getName())
+                .eqIfPresent(IotDeviceBomDO::getDeviceId, reqVO.getDeviceId())
+                .eqIfPresent(IotDeviceBomDO::getStatus, reqVO.getStatus()));
+    }
+
 }

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

@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.pms.service.iotdevicebom;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom.vo.IotDeviceBomListReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom.vo.IotDeviceBomPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom.vo.IotDeviceBomSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicebom.IotDeviceBomDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * PMS 设备BOM 关系 Service 接口
@@ -52,4 +54,11 @@ public interface IotDeviceBomService {
      */
     PageResult<IotDeviceBomDO> getIotDeviceBomPage(IotDeviceBomPageReqVO pageReqVO);
 
+    /**
+     * 筛选 设备bom 列表
+     *
+     * @param iotDeviceBomListReqVO 筛选条件请求 VO
+     * @return 设备bom 列表
+     */
+    List<IotDeviceBomDO> getDeviceBomList(IotDeviceBomListReqVO iotDeviceBomListReqVO);
 }

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

@@ -2,15 +2,20 @@ package cn.iocoder.yudao.module.pms.service.iotdevicebom;
 
 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.iotdevicebom.vo.IotDeviceBomListReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom.vo.IotDeviceBomPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicebom.vo.IotDeviceBomSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicebom.IotDeviceBomDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotmaterialgroup.IotMaterialGroupDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotdevicebom.IotDeviceBomMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.Comparator;
+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_DEVICE_BOM_NOT_EXISTS;
 
@@ -69,4 +74,11 @@ public class IotDeviceBomServiceImpl implements IotDeviceBomService {
         return iotDeviceBomMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<IotDeviceBomDO> getDeviceBomList(IotDeviceBomListReqVO iotDeviceBomListReqVO) {
+        List<IotDeviceBomDO> list = iotDeviceBomMapper.selectList(iotDeviceBomListReqVO);
+        list.sort(Comparator.comparing(IotDeviceBomDO::getSort));
+        return list;
+    }
+
 }