diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 11f343d..220c4d4 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.github.oshi diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 11f343d..220c4d4 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index db6d5e7..5eb08fa 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 11f343d..220c4d4 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index db6d5e7..5eb08fa 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 5c2733a..c245073 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-job - 1.3.0.2 + 1.3.1.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 11f343d..220c4d4 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index db6d5e7..5eb08fa 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 5c2733a..c245073 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-job - 1.3.0.2 + 1.3.1.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index cf08d89..8270587 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.board.EquipmentCommonAggr; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.equipment.*; +import com.casic.missiles.job.handler.EquipmentExpireJobHandler; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService; import com.casic.missiles.service.equipment.IEquipmentInfoService; @@ -44,6 +45,8 @@ private final IEquipmentInfoService equipmentInfoService; private final IEquipmentInfoApprovalService approvalService; + private final EquipmentExpireJobHandler jobHandler; + @ApiOperation("直接编辑设备") @PostMapping("/info/update") public ReturnDTO update(@RequestBody EquipmentApprovalForm approvalForm){ @@ -192,5 +195,11 @@ return ReturnUtil.success(super.packForBT(page)); } + @GetMapping("/job/test") + @ResponseBody + public ReturnDTO jobTest() { + jobHandler.equipmentExpireHandler(); + return ReturnUtil.success(); + } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 11f343d..220c4d4 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index db6d5e7..5eb08fa 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 5c2733a..c245073 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-job - 1.3.0.2 + 1.3.1.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index cf08d89..8270587 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.board.EquipmentCommonAggr; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.equipment.*; +import com.casic.missiles.job.handler.EquipmentExpireJobHandler; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService; import com.casic.missiles.service.equipment.IEquipmentInfoService; @@ -44,6 +45,8 @@ private final IEquipmentInfoService equipmentInfoService; private final IEquipmentInfoApprovalService approvalService; + private final EquipmentExpireJobHandler jobHandler; + @ApiOperation("直接编辑设备") @PostMapping("/info/update") public ReturnDTO update(@RequestBody EquipmentApprovalForm approvalForm){ @@ -192,5 +195,11 @@ return ReturnUtil.success(super.packForBT(page)); } + @GetMapping("/job/test") + @ResponseBody + public ReturnDTO jobTest() { + jobHandler.equipmentExpireHandler(); + return ReturnUtil.success(); + } } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index fd4b7fc..71699c6 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 compile diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 11f343d..220c4d4 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index db6d5e7..5eb08fa 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 5c2733a..c245073 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-job - 1.3.0.2 + 1.3.1.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index cf08d89..8270587 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.board.EquipmentCommonAggr; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.equipment.*; +import com.casic.missiles.job.handler.EquipmentExpireJobHandler; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService; import com.casic.missiles.service.equipment.IEquipmentInfoService; @@ -44,6 +45,8 @@ private final IEquipmentInfoService equipmentInfoService; private final IEquipmentInfoApprovalService approvalService; + private final EquipmentExpireJobHandler jobHandler; + @ApiOperation("直接编辑设备") @PostMapping("/info/update") public ReturnDTO update(@RequestBody EquipmentApprovalForm approvalForm){ @@ -192,5 +195,11 @@ return ReturnUtil.success(super.packForBT(page)); } + @GetMapping("/job/test") + @ResponseBody + public ReturnDTO jobTest() { + jobHandler.equipmentExpireHandler(); + return ReturnUtil.success(); + } } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index fd4b7fc..71699c6 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 compile diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java index f704dc9..8dde037 100644 --- a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java @@ -38,7 +38,7 @@ queryWrapper.eq("is_del", 0); queryWrapper.lt("certificate_valid", new Date()); queryWrapper.and(i->i.eq("usage_status", EquipmentStatusTypeEnum.UNSEAL).or().eq("usage_status",EquipmentStatusTypeEnum.DELAY)); - List equipmentInfoList = equipmentInfoService.list(); + List equipmentInfoList = equipmentInfoService.list(queryWrapper); for (EquipmentInfo equipmentInfo : equipmentInfoList) { // 延用状态时，获取延用时效 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 11f343d..220c4d4 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index db6d5e7..5eb08fa 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 5c2733a..c245073 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-job - 1.3.0.2 + 1.3.1.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index cf08d89..8270587 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.board.EquipmentCommonAggr; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.equipment.*; +import com.casic.missiles.job.handler.EquipmentExpireJobHandler; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService; import com.casic.missiles.service.equipment.IEquipmentInfoService; @@ -44,6 +45,8 @@ private final IEquipmentInfoService equipmentInfoService; private final IEquipmentInfoApprovalService approvalService; + private final EquipmentExpireJobHandler jobHandler; + @ApiOperation("直接编辑设备") @PostMapping("/info/update") public ReturnDTO update(@RequestBody EquipmentApprovalForm approvalForm){ @@ -192,5 +195,11 @@ return ReturnUtil.success(super.packForBT(page)); } + @GetMapping("/job/test") + @ResponseBody + public ReturnDTO jobTest() { + jobHandler.equipmentExpireHandler(); + return ReturnUtil.success(); + } } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index fd4b7fc..71699c6 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 compile diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java index f704dc9..8dde037 100644 --- a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java @@ -38,7 +38,7 @@ queryWrapper.eq("is_del", 0); queryWrapper.lt("certificate_valid", new Date()); queryWrapper.and(i->i.eq("usage_status", EquipmentStatusTypeEnum.UNSEAL).or().eq("usage_status",EquipmentStatusTypeEnum.DELAY)); - List equipmentInfoList = equipmentInfoService.list(); + List equipmentInfoList = equipmentInfoService.list(queryWrapper); for (EquipmentInfo equipmentInfo : equipmentInfoList) { // 延用状态时，获取延用时效 diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index cb816b0..6c940aa 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 11f343d..220c4d4 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index db6d5e7..5eb08fa 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 5c2733a..c245073 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-job - 1.3.0.2 + 1.3.1.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index cf08d89..8270587 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.board.EquipmentCommonAggr; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.equipment.*; +import com.casic.missiles.job.handler.EquipmentExpireJobHandler; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService; import com.casic.missiles.service.equipment.IEquipmentInfoService; @@ -44,6 +45,8 @@ private final IEquipmentInfoService equipmentInfoService; private final IEquipmentInfoApprovalService approvalService; + private final EquipmentExpireJobHandler jobHandler; + @ApiOperation("直接编辑设备") @PostMapping("/info/update") public ReturnDTO update(@RequestBody EquipmentApprovalForm approvalForm){ @@ -192,5 +195,11 @@ return ReturnUtil.success(super.packForBT(page)); } + @GetMapping("/job/test") + @ResponseBody + public ReturnDTO jobTest() { + jobHandler.equipmentExpireHandler(); + return ReturnUtil.success(); + } } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index fd4b7fc..71699c6 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 compile diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java index f704dc9..8dde037 100644 --- a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java @@ -38,7 +38,7 @@ queryWrapper.eq("is_del", 0); queryWrapper.lt("certificate_valid", new Date()); queryWrapper.and(i->i.eq("usage_status", EquipmentStatusTypeEnum.UNSEAL).or().eq("usage_status",EquipmentStatusTypeEnum.DELAY)); - List equipmentInfoList = equipmentInfoService.list(); + List equipmentInfoList = equipmentInfoService.list(queryWrapper); for (EquipmentInfo equipmentInfo : equipmentInfoList) { // 延用状态时，获取延用时效 diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index cb816b0..6c940aa 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 2ae758a..c9eeb8b 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-common - 1.3.0.2 + 1.3.1.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 11f343d..220c4d4 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index db6d5e7..5eb08fa 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 5c2733a..c245073 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-job - 1.3.0.2 + 1.3.1.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index cf08d89..8270587 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.board.EquipmentCommonAggr; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.equipment.*; +import com.casic.missiles.job.handler.EquipmentExpireJobHandler; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService; import com.casic.missiles.service.equipment.IEquipmentInfoService; @@ -44,6 +45,8 @@ private final IEquipmentInfoService equipmentInfoService; private final IEquipmentInfoApprovalService approvalService; + private final EquipmentExpireJobHandler jobHandler; + @ApiOperation("直接编辑设备") @PostMapping("/info/update") public ReturnDTO update(@RequestBody EquipmentApprovalForm approvalForm){ @@ -192,5 +195,11 @@ return ReturnUtil.success(super.packForBT(page)); } + @GetMapping("/job/test") + @ResponseBody + public ReturnDTO jobTest() { + jobHandler.equipmentExpireHandler(); + return ReturnUtil.success(); + } } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index fd4b7fc..71699c6 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 compile diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java index f704dc9..8dde037 100644 --- a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java @@ -38,7 +38,7 @@ queryWrapper.eq("is_del", 0); queryWrapper.lt("certificate_valid", new Date()); queryWrapper.and(i->i.eq("usage_status", EquipmentStatusTypeEnum.UNSEAL).or().eq("usage_status",EquipmentStatusTypeEnum.DELAY)); - List equipmentInfoList = equipmentInfoService.list(); + List equipmentInfoList = equipmentInfoService.list(queryWrapper); for (EquipmentInfo equipmentInfo : equipmentInfoList) { // 延用状态时，获取延用时效 diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index cb816b0..6c940aa 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 2ae758a..c9eeb8b 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-common - 1.3.0.2 + 1.3.1.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 1611bcd..480f905 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -171,23 +171,23 @@ } private List getScopeOrCurrentDeptIds(){ -// if(ShiroKit.isAdmin()){ -// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); -// if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { -// return dataScope.getDeptIds(); -// } -// }else { -// return getCurrentDeptIds(); -// } -// return null; - - List userDeptList = systemDeptService.getUserDeptList(null); - List userDeptIds = new ArrayList<>(); - if(ObjectUtil.isNotEmpty(userDeptList)) { - userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId()); - userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList()); + if(ShiroKit.isAdmin()){ + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { + return dataScope.getDeptIds(); + } + }else { + return getCurrentDeptIds(); } - return userDeptIds; + return null; + +// List userDeptList = systemDeptService.getUserDeptList(null); +// List userDeptIds = new ArrayList<>(); +// if(ObjectUtil.isNotEmpty(userDeptList)) { +// userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId()); +// userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList()); +// } +// return userDeptIds; } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 11f343d..220c4d4 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index db6d5e7..5eb08fa 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 5c2733a..c245073 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-job - 1.3.0.2 + 1.3.1.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index cf08d89..8270587 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.board.EquipmentCommonAggr; import com.casic.missiles.dto.business.LabelBindDTO; import com.casic.missiles.dto.equipment.*; +import com.casic.missiles.job.handler.EquipmentExpireJobHandler; import com.casic.missiles.model.equipment.EquipmentInfo; import com.casic.missiles.service.equipment.IEquipmentInfoApprovalService; import com.casic.missiles.service.equipment.IEquipmentInfoService; @@ -44,6 +45,8 @@ private final IEquipmentInfoService equipmentInfoService; private final IEquipmentInfoApprovalService approvalService; + private final EquipmentExpireJobHandler jobHandler; + @ApiOperation("直接编辑设备") @PostMapping("/info/update") public ReturnDTO update(@RequestBody EquipmentApprovalForm approvalForm){ @@ -192,5 +195,11 @@ return ReturnUtil.success(super.packForBT(page)); } + @GetMapping("/job/test") + @ResponseBody + public ReturnDTO jobTest() { + jobHandler.equipmentExpireHandler(); + return ReturnUtil.success(); + } } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index fd4b7fc..71699c6 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.0.2 + 1.3.1.0 compile diff --git a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java index f704dc9..8dde037 100644 --- a/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java +++ b/casic-metering-job/src/main/java/com/casic/missiles/job/handler/EquipmentExpireJobHandler.java @@ -38,7 +38,7 @@ queryWrapper.eq("is_del", 0); queryWrapper.lt("certificate_valid", new Date()); queryWrapper.and(i->i.eq("usage_status", EquipmentStatusTypeEnum.UNSEAL).or().eq("usage_status",EquipmentStatusTypeEnum.DELAY)); - List equipmentInfoList = equipmentInfoService.list(); + List equipmentInfoList = equipmentInfoService.list(queryWrapper); for (EquipmentInfo equipmentInfo : equipmentInfoList) { // 延用状态时，获取延用时效 diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index cb816b0..6c940aa 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 2ae758a..c9eeb8b 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.0.2 + 1.3.1.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-model - 1.3.0.2 + 1.3.1.0 com.casic casic-metering-common - 1.3.0.2 + 1.3.1.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java index 1611bcd..480f905 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/NoticeBoardServiceImpl.java @@ -171,23 +171,23 @@ } private List getScopeOrCurrentDeptIds(){ -// if(ShiroKit.isAdmin()){ -// DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); -// if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { -// return dataScope.getDeptIds(); -// } -// }else { -// return getCurrentDeptIds(); -// } -// return null; - - List userDeptList = systemDeptService.getUserDeptList(null); - List userDeptIds = new ArrayList<>(); - if(ObjectUtil.isNotEmpty(userDeptList)) { - userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId()); - userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList()); + if(ShiroKit.isAdmin()){ + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + if (!ScopeEnums.ALL_TYPE.equals(dataScope.getScopeEnums())) { + return dataScope.getDeptIds(); + } + }else { + return getCurrentDeptIds(); } - return userDeptIds; + return null; + +// List userDeptList = systemDeptService.getUserDeptList(null); +// List userDeptIds = new ArrayList<>(); +// if(ObjectUtil.isNotEmpty(userDeptList)) { +// userDeptIds.add(permissionContext.getAuthService().getLoginUser().getDeptId()); +// userDeptIds = userDeptList.stream().map(Dept::getId).collect(Collectors.toList()); +// } +// return userDeptIds; } diff --git a/pom.xml b/pom.xml index dcd5007..026c482 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.casic casic-metering-eqpt-xichang - 1.3.0.2 + 1.3.1.0 casic-metering-eqpt-xichang pom