fix energy

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceCheckRecordController.java

@@ -10,7 +10,6 @@ import cn.iocoder.yudao.module.mes.controller.admin.energydevice.vo.EnergyDevice
 import cn.iocoder.yudao.module.mes.controller.admin.energydevice.vo.EnergyDeviceCheckRecordRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.energydevice.vo.EnergyDeviceCheckRecordSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.energydevice.EnergyDeviceCheckRecordDO;
-import cn.iocoder.yudao.module.mes.dal.mysql.energydevice.EnergyDeviceMapper;
 import cn.iocoder.yudao.module.mes.service.energydevice.EnergyDeviceCheckRecordService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -76,7 +75,9 @@ public class EnergyDeviceCheckRecordController {
     @PreAuthorize("@ss.hasPermission('mes:energy-device-check-record:query')")
     public CommonResult<PageResult<EnergyDeviceCheckRecordRespVO>> getEnergyDeviceCheckRecordPage(@Valid EnergyDeviceCheckRecordPageReqVO pageReqVO) {
         PageResult<EnergyDeviceCheckRecordDO> pageResult = energyDeviceCheckRecordService.getEnergyDeviceCheckRecordPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, EnergyDeviceCheckRecordRespVO.class));
+        PageResult<EnergyDeviceCheckRecordRespVO> pageResult1 =
+                new PageResult<>(energyDeviceCheckRecordService.buildVOList(pageResult.getList()),pageResult.getTotal());
+        return success(pageResult1);
     }
 
     @GetMapping("/export-excel")
@@ -87,9 +88,10 @@ public class EnergyDeviceCheckRecordController {
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<EnergyDeviceCheckRecordDO> list = energyDeviceCheckRecordService.getEnergyDeviceCheckRecordPage(pageReqVO).getList();
+
         // 导出 Excel
         ExcelUtils.write(response, "抄表记录.xls", "数据", EnergyDeviceCheckRecordRespVO.class,
-                        BeanUtils.toBean(list, EnergyDeviceCheckRecordRespVO.class));
+                        energyDeviceCheckRecordService.buildVOList(list));
     }
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceController.java

@@ -69,7 +69,13 @@ public class EnergyDeviceController {
         EnergyDeviceDO energyDevice = energyDeviceService.getEnergyDevice(id);
         return success(BeanUtils.toBean(energyDevice, EnergyDeviceRespVO.class));
     }
-
+    @GetMapping("/getList")
+    @Operation(summary = "获得能源设备列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<List<EnergyDeviceDO>> getList(@Valid EnergyDevicePageReqVO pageReqVO) {
+        List<EnergyDeviceDO> list = energyDeviceService.getEnergyDevicePage(pageReqVO).getList();
+        return success(list);
+    }
     @GetMapping("/page")
     @Operation(summary = "获得能源设备分页")
     @PreAuthorize("@ss.hasPermission('mes:energy-device:query')")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/vo/EnergyDeviceCheckRecordRespVO.java

@@ -20,8 +20,10 @@ public class EnergyDeviceCheckRecordRespVO {
     @ExcelProperty("设备类型")
     private String deviceType;
     @Schema(description = "能源设备Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17334")
-    @ExcelProperty("能源设备Id")
     private Long deviceId;
+    @Schema(description = "能源设备", requiredMode = Schema.RequiredMode.REQUIRED, example = "17334")
+    @ExcelProperty("能源设备")
+    private String deviceName;
 
     @Schema(description = "上次抄表时间")
     @ExcelProperty("上次抄表时间")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/vo/MachineComponentListReqVO.java

@@ -85,4 +85,7 @@ public class MachineComponentListReqVO {
     @Schema(description = "上次维保时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] lastMaitainTime;
+
+    @Schema(description = "模具id")
+    private Long moldId;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/vo/MachineComponentRespVO.java

@@ -107,4 +107,10 @@ public class MachineComponentRespVO {
     @Schema(description = "上次维保时间")
     @ExcelProperty("上次维保时间")
     private LocalDateTime lastMaitainTime;
+
+    @Schema(description = "模具id")
+    private Long moldId;
+    @Schema(description = "模具名称")
+    @ExcelProperty("模具名称")
+    private String moldName;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/vo/MachineComponentSaveReqVO.java

@@ -24,7 +24,6 @@ public class MachineComponentSaveReqVO {
     private Long parentId;
 
     @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "显示顺序不能为空")
     private Integer sort;
 
     @Schema(description = "组织机台ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13753")
@@ -80,4 +79,6 @@ public class MachineComponentSaveReqVO {
     @Schema(description = "上次维保时间")
     private LocalDateTime lastMaitainTime;
 
+    @Schema(description = "模具id")
+    private Long moldId;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/machine/MachineComponentDO.java

@@ -119,4 +119,6 @@ public class MachineComponentDO extends BaseDO {
      * 上次维保时间
      */
     private LocalDateTime lastMaitainTime;
+    //@Schema(description = "模具id")
+    private Long moldId;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/machine/MachineComponentMapper.java

@@ -40,6 +40,8 @@ public interface MachineComponentMapper extends BaseMapperX<MachineComponentDO>
                 .eqIfPresent(MachineComponentDO::getTrueMaintainTimeUnit, reqVO.getTrueMaintainTimeUnit())
                 .eqIfPresent(MachineComponentDO::getTrueMaintainTimeType, reqVO.getTrueMaintainTimeType())
                 .betweenIfPresent(MachineComponentDO::getLastMaitainTime, reqVO.getLastMaitainTime())
+                .eqIfPresent(MachineComponentDO::getMoldId, reqVO.getMoldId())
+                .orderByDesc(MachineComponentDO::getSort)
                 .orderByDesc(MachineComponentDO::getId));
     }
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/energydevice/EnergyDeviceCheckRecordService.java

@@ -2,10 +2,12 @@ package cn.iocoder.yudao.module.mes.service.energydevice;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.mes.controller.admin.energydevice.vo.EnergyDeviceCheckRecordPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.energydevice.vo.EnergyDeviceCheckRecordRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.energydevice.vo.EnergyDeviceCheckRecordSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.energydevice.EnergyDeviceCheckRecordDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 抄表记录 Service 接口
@@ -51,5 +53,5 @@ public interface EnergyDeviceCheckRecordService {
      * @return 抄表记录分页
      */
     PageResult<EnergyDeviceCheckRecordDO> getEnergyDeviceCheckRecordPage(EnergyDeviceCheckRecordPageReqVO pageReqVO);
-
+    List<EnergyDeviceCheckRecordRespVO> buildVOList(List<EnergyDeviceCheckRecordDO> list);
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/energydevice/EnergyDeviceCheckRecordServiceImpl.java

@@ -1,8 +1,11 @@
 package cn.iocoder.yudao.module.mes.service.energydevice;
 
+import cn.hutool.core.collection.CollUtil;
 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.module.mes.controller.admin.energydevice.vo.EnergyDeviceCheckRecordPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.energydevice.vo.EnergyDeviceCheckRecordRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.energydevice.vo.EnergyDeviceCheckRecordSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.energydevice.EnergyDeviceCheckRecordDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.energydevice.EnergyDeviceDO;
@@ -13,11 +16,14 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.ENERGY_DEVICE_CHECK_RECORD_NOT_EXISTS;
 
 /**
@@ -33,6 +39,8 @@ public class EnergyDeviceCheckRecordServiceImpl implements EnergyDeviceCheckReco
     private EnergyDeviceCheckRecordMapper energyDeviceCheckRecordMapper;
     @Resource
     private EnergyDeviceMapper energyDeviceMapper;
+    @Resource
+    private EnergyDeviceService energyDeviceService;
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createEnergyDeviceCheckRecord(EnergyDeviceCheckRecordSaveReqVO createReqVO) {
@@ -89,4 +97,18 @@ public class EnergyDeviceCheckRecordServiceImpl implements EnergyDeviceCheckReco
         return energyDeviceCheckRecordMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<EnergyDeviceCheckRecordRespVO> buildVOList(List<EnergyDeviceCheckRecordDO> list) {
+        if (CollUtil.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        Map<Long, EnergyDeviceDO> map = energyDeviceService.getMap(
+                convertSet(list, EnergyDeviceCheckRecordDO::getDeviceId));
+
+        return BeanUtils.toBean(list, EnergyDeviceCheckRecordRespVO.class, item -> {
+            MapUtils.findAndThen(map, item.getDeviceId(),
+                    deviceDO -> item.setDeviceName(deviceDO.getName()));
+
+        });
+    }
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/energydevice/EnergyDeviceService.java

@@ -8,6 +8,12 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.energydevice.EnergyDeviceCheck
 import cn.iocoder.yudao.module.mes.dal.dataobject.energydevice.EnergyDeviceDO;
 
 import javax.validation.Valid;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
 
 /**
  * 能源设备 Service 接口
@@ -94,5 +100,10 @@ public interface EnergyDeviceService {
      * @return 抄表记录
 	 */
     EnergyDeviceCheckRecordDO getEnergyDeviceCheckRecord(Long id);
+    List<EnergyDeviceDO> getList(Collection<Long> ids);
 
+    default Map<Long, EnergyDeviceDO> getMap(Collection<Long> ids) {
+        if (ids.isEmpty()) return new HashMap<>();
+        return convertMap(getList(ids), EnergyDeviceDO::getId);
+    }
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/energydevice/EnergyDeviceServiceImpl.java

@@ -14,9 +14,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.ENERGY_DEVICE_CHECK_RECORD_NOT_EXISTS;
@@ -143,5 +144,8 @@ public class EnergyDeviceServiceImpl implements EnergyDeviceService {
     private void deleteEnergyDeviceCheckRecordByDeviceId(Long deviceId) {
         energyDeviceCheckRecordMapper.deleteByDeviceId(deviceId);
     }
-
+    @Override
+    public List<EnergyDeviceDO> getList(Collection<Long> ids) {
+        return energyDeviceMapper.selectBatchIds(ids);
+    }
 }