计量器具上传

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/IotMeasureDetectController.java

@@ -1,35 +1,36 @@
 package cn.iocoder.yudao.module.pms.controller.admin.qhse.measure;
 
+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.qhse.measure.vo.IotMeasureDetectPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureDetectRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureDetectSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureBookDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureDetectDO;
+import cn.iocoder.yudao.module.pms.service.qhse.measure.IotMeasureBookService;
 import cn.iocoder.yudao.module.pms.service.qhse.measure.IotMeasureDetectService;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+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 java.util.Objects;
+import java.util.stream.Collectors;
 
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 
 @Tag(name = "管理后台 - 计量器具-检测校准明细")
@@ -40,6 +41,8 @@ public class IotMeasureDetectController {
 
     @Resource
     private IotMeasureDetectService iotMeasureDetectService;
+    @Autowired
+    private IotMeasureBookService iotMeasureBookService;
 
     @PostMapping("/create")
     @Operation(summary = "创建计量器具-检测校准明细")
@@ -79,7 +82,19 @@ public class IotMeasureDetectController {
     @PreAuthorize("@ss.hasPermission('rq:iot-measure-detect:query')")
     public CommonResult<PageResult<IotMeasureDetectRespVO>> getIotMeasureDetectPage(@Valid IotMeasureDetectPageReqVO pageReqVO) {
         PageResult<IotMeasureDetectDO> pageResult = iotMeasureDetectService.getIotMeasureDetectPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, IotMeasureDetectRespVO.class));
+        List<IotMeasureDetectRespVO> collect = pageResult.getList().stream().map(e -> {
+            IotMeasureDetectRespVO iotMeasureDetectRespVO = new IotMeasureDetectRespVO();
+            BeanUtils.copyProperties(e, iotMeasureDetectRespVO);
+            if (Objects.nonNull(iotMeasureDetectRespVO.getMeasureId())) {
+                IotMeasureBookDO iotMeasureBook = iotMeasureBookService.getIotMeasureBook(iotMeasureDetectRespVO.getMeasureId());
+                if (Objects.nonNull(iotMeasureBook)) {
+                    iotMeasureDetectRespVO.setMeasureName(iotMeasureDetectRespVO.getMeasureName());
+                    iotMeasureDetectRespVO.setMeasureCode(iotMeasureDetectRespVO.getMeasureCode());
+                }
+            }
+            return iotMeasureDetectRespVO;
+        }).collect(Collectors.toList());
+        return success(new PageResult<>(collect, pageResult.getTotal()));
     }
 
     @GetMapping("/export-excel")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureDetectRespVO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 计量器具-检测校准明细 Response VO")
 @Data
@@ -51,4 +51,6 @@ public class IotMeasureDetectRespVO {
     private String measureCertNo;
     @Schema(description = "检测/检验标准")
     private String detectStandard;
+    private String measureName;
+    private String measureCode;
 }