feat：添加设备管理相关列表

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/scheduled/config/SchedulerConfig.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.controller.admin.device.scheduled;
+package cn.iocoder.yudao.module.iot.controller.admin.device.scheduled.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/scheduled/coretask/DeviceTask.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.controller.admin.device.scheduled;
+package cn.iocoder.yudao.module.iot.controller.admin.device.scheduled.coretask;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/scheduled/scheduler/TaskSchedulerManager.java

@@ -1,6 +1,7 @@
 // TaskSchedulerManager.java
-package cn.iocoder.yudao.module.iot.controller.admin.device.scheduled;
+package cn.iocoder.yudao.module.iot.controller.admin.device.scheduled.scheduler;
 
+import cn.iocoder.yudao.module.iot.controller.admin.device.scheduled.coretask.DeviceTask;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/scheduled/utils/CronExpressionUtils.java

@@ -1,11 +1,11 @@
-package cn.iocoder.yudao.module.iot.controller.admin.device.scheduled;
+package cn.iocoder.yudao.module.iot.controller.admin.device.scheduled.utils;
 
 import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
 @Component
-public class CronExpressionUtil {
+public class CronExpressionUtils {
 
     /**
      * 将秒数转换为cron表达式

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodel/DeviceModelController.java

@@ -87,6 +87,7 @@ public class DeviceModelController {
         return success(BeanUtils.toBean(pageResult, DeviceModelRespVO.class));
     }
 
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出采集设备模型 Excel")
     @PreAuthorize("@ss.hasPermission('iot:device-model:export')")

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java

@@ -6,8 +6,8 @@ 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.common.util.opc.OpcUtils;
-import cn.iocoder.yudao.module.iot.controller.admin.device.scheduled.CronExpressionUtil;
+import cn.iocoder.yudao.module.iot.controller.admin.device.scheduled.utils.CronExpressionUtils;
-import cn.iocoder.yudao.module.iot.controller.admin.device.scheduled.TaskSchedulerManager;
+import cn.iocoder.yudao.module.iot.controller.admin.device.scheduled.scheduler.TaskSchedulerManager;
 import cn.iocoder.yudao.module.iot.controller.admin.device.vo.*;
 import cn.iocoder.yudao.module.iot.controller.admin.devicecontactmodel.vo.DeviceContactModelPageReqVO;
 import cn.iocoder.yudao.module.iot.controller.admin.mqttdatarecord.vo.MqttDataRecordPageReqVO;
@@ -699,7 +699,7 @@ public class DeviceServiceImpl implements DeviceService {
                 throw new RuntimeException("设备cron表达式为空");
             }
 
-            String cronExpression = CronExpressionUtil.secondsToCron(deviceDO.getSampleCycle());
+            String cronExpression = CronExpressionUtils.secondsToCron(deviceDO.getSampleCycle());
 
             // 2. 启动定时任务
             boolean success = taskSchedulerManager.startDeviceTask(

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/criticalcomponent/CriticalComponentController.java

@@ -85,6 +85,14 @@ public class CriticalComponentController {
         return success(BeanUtils.toBean(pageResult, CriticalComponentRespVO.class));
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得设备关键件列表")
+    @PreAuthorize("@ss.hasPermission('mes:critical-component:query')")
+    public CommonResult<List<CriticalComponentDO>> getCriticalComponentList() {
+        List<CriticalComponentDO> criticalComponentList= criticalComponentService.getCriticalComponentList();
+        return success(criticalComponentList);
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出设备关键件 Excel")
     @PreAuthorize("@ss.hasPermission('mes:critical-component:export')")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java

@@ -85,6 +85,8 @@ public class DeviceLedgerController {
         return success(BeanUtils.toBean(deviceLedger, DeviceLedgerRespVO.class));
     }
 
+
+
     @GetMapping("/page")
     @Operation(summary = "获得设备台账分页")
     @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')")
@@ -94,13 +96,21 @@ public class DeviceLedgerController {
     }
 
 
+    @GetMapping("/list")
+    @Operation(summary = "获得设备台账列表")
+    @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')")
+    public CommonResult<List<DeviceLedgerDO>> getDeviceLedgerList() {
+        List<DeviceLedgerDO> deviceLedgerDOList = deviceLedgerService.getDeviceLedgerList();
+        return success(deviceLedgerDOList);
+    }
+
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出设备台账 Excel")
     @PreAuthorize("@ss.hasPermission('mes:device-ledger:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportDeviceLedgerExcel(@Valid DeviceLedgerPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<DeviceLedgerDO> list = deviceLedgerService.getDeviceLedgerPage(pageReqVO).getList();
         List<DeviceLedgerRespVO> deviceLedgerRespVOS = BeanUtils.toBean(list, DeviceLedgerRespVO.class);
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/DvSubjectController.java

@@ -103,6 +103,14 @@ public class DvSubjectController {
         return success(buildCreatorName(dvSubjectRespVOPageResult));
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得维保项目列表")
+    @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')")
+    public CommonResult<List<DvSubjectRespVO>> getDvSubjectList() {
+        List<DvSubjectDO> dvSubjectDOList = dvSubjectService.getDvSubjectList();
+        return success(dvSubjectDOList);
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出维保项目 Excel")
     @PreAuthorize("@ss.hasPermission('mes:dv-subject:export')")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectRespVO.java

@@ -15,7 +15,7 @@ import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
 @Schema(description = "管理后台 - 维保项目 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class DvSubjectRespVO extends BaseDO {
+public class DvSubjectRespVO{
 
     @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24679")
 //    @ExcelProperty("ID")
@@ -63,6 +63,9 @@ public class DvSubjectRespVO extends BaseDO {
     @ExcelProperty("判定基准")
     private String judgmentCriteria;
 
+    @Schema(description = "创建人")
+    private String creator;
+
     @Schema(description = "创建人名字")
     @ExcelProperty("创建人名字")
     private String creatorName;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/planmaintenance/PlanMaintenanceController.java

@@ -99,6 +99,14 @@ public class PlanMaintenanceController {
         return success(buildPageCreatorName(planMaintenanceRespVOPageResult));
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得方案维护列表")
+    @PreAuthorize("@ss.hasPermission('mes:plan-maintenance:query')")
+    public CommonResult<List<PlanMaintenanceDO>> getPlanMaintenanceList() {
+        List<PlanMaintenanceDO> planMaintenanceList = planMaintenanceService.getPlanMaintenanceList();
+        return success(planMaintenanceList);
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出方案维护 Excel")
     @PreAuthorize("@ss.hasPermission('mes:plan-maintenance:export')")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/criticalcomponent/CriticalComponentService.java

@@ -52,4 +52,5 @@ public interface CriticalComponentService {
      */
     PageResult<CriticalComponentDO> getCriticalComponentPage(CriticalComponentPageReqVO pageReqVO);
 
+    List<CriticalComponentDO> getCriticalComponentList();
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/criticalcomponent/CriticalComponentServiceImpl.java

@@ -156,4 +156,9 @@ public class CriticalComponentServiceImpl implements CriticalComponentService {
         return criticalComponentMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<CriticalComponentDO> getCriticalComponentList() {
+        return criticalComponentMapper.selectList();
+    }
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerService.java

@@ -51,4 +51,5 @@ public interface DeviceLedgerService {
      */
     PageResult<DeviceLedgerDO> getDeviceLedgerPage(DeviceLedgerPageReqVO pageReqVO);
 
+    List<DeviceLedgerDO> getDeviceLedgerList();
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java

@@ -198,7 +198,13 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
 
     @Override
     public PageResult<DeviceLedgerDO> getDeviceLedgerPage(DeviceLedgerPageReqVO pageReqVO) {
-        return deviceLedgerMapper.selectPage(pageReqVO);
+        PageResult<DeviceLedgerDO> deviceLedgerDOPageResult = deviceLedgerMapper.selectPage(pageReqVO);
+        return deviceLedgerDOPageResult;
+    }
+
+    @Override
+    public List<DeviceLedgerDO> getDeviceLedgerList() {
+        return deviceLedgerMapper.selectList();
     }
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvsubject/DvSubjectService.java

@@ -53,4 +53,5 @@ public interface DvSubjectService {
      */
     PageResult<DvSubjectDO> getDvSubjectPage(DvSubjectPageReqVO pageReqVO);
 
+    List<DvSubjectDO> getDvSubjectList();
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvsubject/DvSubjectServiceImpl.java

@@ -125,4 +125,9 @@ public class DvSubjectServiceImpl implements DvSubjectService {
         return dvSubjectMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<DvSubjectDO> getDvSubjectList() {
+        return dvSubjectMapper.selectList();
+    }
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/planmaintenance/PlanMaintenanceService.java

@@ -56,4 +56,5 @@ public interface PlanMaintenanceService {
 
     List<DvSubjectDO> getSubjectList(Long id);
 
+    List<PlanMaintenanceDO> getPlanMaintenanceList();
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/planmaintenance/PlanMaintenanceServiceImpl.java

@@ -213,4 +213,9 @@ public class PlanMaintenanceServiceImpl implements PlanMaintenanceService {
         return dvSubjectDOList;
     }
 
+    @Override
+    public List<PlanMaintenanceDO> getPlanMaintenanceList() {
+        return planMaintenanceMapper.selectList();
+    }
+
 }

yudao-server/src/main/resources/application-dev.yaml

@@ -88,7 +88,7 @@ spring:
 # Quartz 配置项，对应 QuartzProperties 配置类
 spring:
   quartz:
-    auto-startup: true # 本地开发环境，尽量不要开启 Job
+    auto-startup: false # 本地开发环境，尽量不要开启 Job
     scheduler-name: schedulerName # Scheduler 名字。默认为 schedulerName
     job-store-type: jdbc # Job 存储器类型。默认为 memory 表示内存，可选 jdbc 使用数据库。
     wait-for-jobs-to-complete-on-shutdown: true # 应用关闭时，是否等待定时任务执行完成。默认为 false ，建议设置为 true