diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseAlarmInfoController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseAlarmInfoController.java index bcd62b3b..670dc3e6 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseAlarmInfoController.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/BaseAlarmInfoController.java @@ -104,6 +104,14 @@ public class BaseAlarmInfoController extends BaseController { return toAjax(baseAlarmInfoService.deleteWithValidByIds(List.of(alarmInfoIds), true)); } + /** + * 获取报警信息数量 + */ + @GetMapping("/count") + public R count(BaseAlarmInfoBo bo) { + return R.ok(baseAlarmInfoService.count(bo)); + } + /** * 下拉框查询报警信息列表 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceDebuggingController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceDebuggingController.java index 2ef87037..15ef29b6 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceDebuggingController.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceDebuggingController.java @@ -104,6 +104,14 @@ public class DmsBaseDeviceDebuggingController extends BaseController { return toAjax(dmsBaseDeviceDebuggingService.deleteWithValidByIds(List.of(deviceDebuggingIds), true)); } + /** + * 获取设备调试数量 + */ + @GetMapping("/count") + public R count(DmsBaseDeviceDebuggingBo bo) { + return R.ok(dmsBaseDeviceDebuggingService.count(bo)); + } + /** * 下拉框查询设备调试信息列表 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceInstallController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceInstallController.java index a91da706..881de49f 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceInstallController.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDeviceInstallController.java @@ -105,6 +105,14 @@ public class DmsBaseDeviceInstallController extends BaseController { return toAjax(dmsBaseDeviceInstallService.deleteWithValidByIds(List.of(deviceInstallIds), true)); } + /** + * 获取设备安装数量 + */ + @GetMapping("/count") + public R count(DmsBaseDeviceInstallBo bo) { + return R.ok(dmsBaseDeviceInstallService.count(bo)); + } + /** * 下拉框查询设备安装信息列表 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDevicePurchaseController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDevicePurchaseController.java index 05ddd530..134a7291 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDevicePurchaseController.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseDevicePurchaseController.java @@ -104,6 +104,14 @@ public class DmsBaseDevicePurchaseController extends BaseController { return toAjax(dmsBaseDevicePurchaseService.deleteWithValidByIds(List.of(devicePurchaseIds), true)); } + /** + * 获取设备采购数量 + */ + @GetMapping("/count") + public R count(DmsBaseDevicePurchaseBo bo) { + return R.ok(dmsBaseDevicePurchaseService.count(bo)); + } + /** * 下拉框查询设备采购信息列表 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsFaultInstanceController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsFaultInstanceController.java index b94bf9df..7b0dbe96 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsFaultInstanceController.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsFaultInstanceController.java @@ -106,6 +106,14 @@ public class DmsBillsFaultInstanceController extends BaseController { return toAjax(dmsBillsFaultInstanceService.deleteWithValidByIds(List.of(repairInstanceIds), true)); } + /** + * 获取故障报修工单数量 + */ + @GetMapping("/count") + public R count(DmsBillsFaultInstanceBo bo) { + return R.ok(dmsBillsFaultInstanceService.count(bo)); + } + /** * 下拉框查询故障报修工单列表 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsInspectInstanceController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsInspectInstanceController.java index acc74b76..8ff12536 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsInspectInstanceController.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsInspectInstanceController.java @@ -104,6 +104,14 @@ public class DmsBillsInspectInstanceController extends BaseController { return toAjax(dmsBillsInspectInstanceService.deleteWithValidByIds(List.of(inspectInstanceIds), true)); } + /** + * 获取点巡检工单数量 + */ + @GetMapping("/count") + public R count(DmsBillsInspectInstanceBo bo) { + return R.ok(dmsBillsInspectInstanceService.count(bo)); + } + /** * 下拉框查询点巡检工单列表 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsMaintInstanceController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsMaintInstanceController.java index 1644a17a..b3bbfc14 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsMaintInstanceController.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsMaintInstanceController.java @@ -105,6 +105,14 @@ public class DmsBillsMaintInstanceController extends BaseController { return toAjax(dmsBillsMaintInstanceService.deleteWithValidByIds(List.of(maintInstanceIds), true)); } + /** + * 获取保养工单数量 + */ + @GetMapping("/count") + public R count(DmsBillsMaintInstanceBo bo) { + return R.ok(dmsBillsMaintInstanceService.count(bo)); + } + /** * 下拉框查询保养工单列表 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseAlarmInfoService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseAlarmInfoService.java index 6c3fc72f..ec46f802 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseAlarmInfoService.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IBaseAlarmInfoService.java @@ -42,6 +42,8 @@ public interface IBaseAlarmInfoService { */ List queryList(BaseAlarmInfoBo bo); + Long count(BaseAlarmInfoBo bo); + /** * 新增报警信息 * diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceDebuggingService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceDebuggingService.java index 66ca0736..aefd1b99 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceDebuggingService.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceDebuggingService.java @@ -42,6 +42,8 @@ public interface IDmsBaseDeviceDebuggingService { */ List queryList(DmsBaseDeviceDebuggingBo bo); + Long count(DmsBaseDeviceDebuggingBo bo); + /** * 新增设备调试信息 * diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceInstallService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceInstallService.java index 2d96c856..8eb374e6 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceInstallService.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDeviceInstallService.java @@ -42,6 +42,8 @@ public interface IDmsBaseDeviceInstallService { */ List queryList(DmsBaseDeviceInstallBo bo); + Long count(DmsBaseDeviceInstallBo bo); + /** * 新增设备安装信息 * diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDevicePurchaseService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDevicePurchaseService.java index c06c1fd4..96437940 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDevicePurchaseService.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseDevicePurchaseService.java @@ -42,6 +42,8 @@ public interface IDmsBaseDevicePurchaseService { */ List queryList(DmsBaseDevicePurchaseBo bo); + Long count(DmsBaseDevicePurchaseBo bo); + /** * 新增设备采购信息 * diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsFaultInstanceService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsFaultInstanceService.java index 04cfde91..d0d59391 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsFaultInstanceService.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsFaultInstanceService.java @@ -46,6 +46,8 @@ public interface IDmsBillsFaultInstanceService { */ List queryList(DmsBillsFaultInstanceBo bo); + Long count(DmsBillsFaultInstanceBo bo); + /** * 新增故障报修工单 * diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsInspectInstanceService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsInspectInstanceService.java index f0621f6b..c78aa6ef 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsInspectInstanceService.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsInspectInstanceService.java @@ -44,6 +44,8 @@ public interface IDmsBillsInspectInstanceService { */ List queryList(DmsBillsInspectInstanceBo bo); + Long count(DmsBillsInspectInstanceBo bo); + /** * 新增点巡检工单 * diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsMaintInstanceService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsMaintInstanceService.java index a507e8fb..546dbb02 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsMaintInstanceService.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsMaintInstanceService.java @@ -42,6 +42,8 @@ public interface IDmsBillsMaintInstanceService { */ List queryList(DmsBillsMaintInstanceBo bo); + Long count(DmsBillsMaintInstanceBo bo); + /** * 新增保养工单 * diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmInfoServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmInfoServiceImpl.java index 84ffcb78..e82baa9a 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/BaseAlarmInfoServiceImpl.java @@ -74,6 +74,12 @@ public class BaseAlarmInfoServiceImpl implements IBaseAlarmInfoService { return baseMapper.selectVoList(lqw); } + @Override + public Long count(BaseAlarmInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectCount(lqw); + } + private MPJLambdaWrapper buildQueryWrapper(BaseAlarmInfoBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseAlarmInfo.class) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceDebuggingServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceDebuggingServiceImpl.java index 6eccfb0d..e62fba00 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceDebuggingServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceDebuggingServiceImpl.java @@ -70,6 +70,12 @@ public class DmsBaseDeviceDebuggingServiceImpl implements IDmsBaseDeviceDebuggin return baseMapper.selectVoList(lqw); } + @Override + public Long count(DmsBaseDeviceDebuggingBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectCount(lqw); + } + private MPJLambdaWrapper buildQueryWrapper(DmsBaseDeviceDebuggingBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseDeviceDebugging.class) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceInstallServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceInstallServiceImpl.java index 0ae2fcc8..4b956804 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceInstallServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDeviceInstallServiceImpl.java @@ -76,6 +76,12 @@ public class DmsBaseDeviceInstallServiceImpl implements IDmsBaseDeviceInstallSer return baseMapper.selectVoList(lqw); } + @Override + public Long count(DmsBaseDeviceInstallBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectCount(lqw); + } + private MPJLambdaWrapper buildQueryWrapper(DmsBaseDeviceInstallBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseDeviceInstall.class) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDevicePurchaseServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDevicePurchaseServiceImpl.java index af94f7fe..ecb12d7e 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDevicePurchaseServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseDevicePurchaseServiceImpl.java @@ -72,6 +72,12 @@ public class DmsBaseDevicePurchaseServiceImpl implements IDmsBaseDevicePurchaseS return baseMapper.selectVoList(lqw); } + @Override + public Long count(DmsBaseDevicePurchaseBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectCount(lqw); + } + private MPJLambdaWrapper buildQueryWrapper(DmsBaseDevicePurchaseBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBaseDevicePurchase.class) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java index cbcaaf7e..3cbbea7f 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java @@ -116,6 +116,12 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS return baseMapper.selectVoList(lqw); } + @Override + public Long count(DmsBillsFaultInstanceBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectCount(lqw); + } + private MPJLambdaWrapper buildQueryWrapper(DmsBillsFaultInstanceBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBillsFaultInstance.class) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java index 3bbaf11e..aa157e1e 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java @@ -91,6 +91,12 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta return baseMapper.selectVoList(lqw); } + @Override + public Long count(DmsBillsInspectInstanceBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectCount(lqw); + } + private MPJLambdaWrapper buildQueryWrapper(DmsBillsInspectInstanceBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBillsInspectInstance.class) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java index 074c386e..41129e6b 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java @@ -109,6 +109,12 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS return baseMapper.selectVoList(lqw); } + @Override + public Long count(DmsBillsMaintInstanceBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectCount(lqw); + } + private MPJLambdaWrapper buildQueryWrapper(DmsBillsMaintInstanceBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsBillsMaintInstance.class) diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsMaintStanceExecutor.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsMaintStanceExecutor.java index d7c8c8b2..fc658719 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsMaintStanceExecutor.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsMaintStanceExecutor.java @@ -38,11 +38,11 @@ public class DmsMaintStanceExecutor { String tenantId = (String) paramMap.get("tenantId"); String user = (String) paramMap.get("userId"); Long userId = Long.parseLong(user); - + log.info("开始执行设备保养实例生成任务,计划编码:{},租户ID:{},用户ID:{}", planCode, tenantId, userId); - + R instance = dmsBillsMaintInstanceService.insertDmsBillsMaintInstance(planCode, tenantId, userId); - + // 检查业务调用结果 if (instance.getCode() == 200) { log.info("设备保养实例生成成功,计划编码:{},结果:{}", planCode, instance.getData());