diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/controller/admin/inspection/vo/InspectionRecordPageReqVO.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/controller/admin/inspection/vo/InspectionRecordPageReqVO.java new file mode 100644 index 0000000..cc556f4 --- /dev/null +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/controller/admin/inspection/vo/InspectionRecordPageReqVO.java @@ -0,0 +1,31 @@ +package com.viewsh.module.ops.environment.controller.admin.inspection.vo; + +import com.viewsh.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.viewsh.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 巡检记录分页查询 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionRecordPageReqVO extends PageParam { + + @Schema(description = "区域ID", example = "1") + private Long areaId; + + @Schema(description = "巡检员用户ID", example = "100") + private Long inspectorId; + + @Schema(description = "巡检结果(0不合格 1合格)", example = "1") + private Integer resultStatus; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/inspection/InspectionRecordService.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/inspection/InspectionRecordService.java index 0e70d99..a5c39c7 100644 --- a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/inspection/InspectionRecordService.java +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/inspection/InspectionRecordService.java @@ -1,6 +1,9 @@ package com.viewsh.module.ops.environment.service.inspection; +import com.viewsh.framework.common.pojo.PageResult; +import com.viewsh.module.ops.environment.controller.admin.inspection.vo.InspectionRecordPageReqVO; import com.viewsh.module.ops.environment.controller.admin.inspection.vo.InspectionSubmitReqVO; +import com.viewsh.module.ops.environment.dal.dataobject.inspection.OpsInspectionRecordDO; /** * 巡检记录 Service 接口 @@ -16,4 +19,12 @@ public interface InspectionRecordService { */ Long submitInspection(InspectionSubmitReqVO submitReqVO, Long inspectorId); + /** + * 获得巡检记录分页 + * + * @param pageReqVO 分页查询 + * @return 巡检记录分页 + */ + PageResult getRecordPage(InspectionRecordPageReqVO pageReqVO); + } diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/inspection/InspectionRecordServiceImpl.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/inspection/InspectionRecordServiceImpl.java index caa384e..82bb7e0 100644 --- a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/inspection/InspectionRecordServiceImpl.java +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/inspection/InspectionRecordServiceImpl.java @@ -1,5 +1,8 @@ package com.viewsh.module.ops.environment.service.inspection; +import com.viewsh.framework.common.pojo.PageResult; +import com.viewsh.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.viewsh.module.ops.environment.controller.admin.inspection.vo.InspectionRecordPageReqVO; import com.viewsh.module.ops.environment.controller.admin.inspection.vo.InspectionSubmitItemVO; import com.viewsh.module.ops.environment.controller.admin.inspection.vo.InspectionSubmitReqVO; import com.viewsh.module.ops.environment.dal.dataobject.inspection.OpsInspectionRecordDO; @@ -82,4 +85,14 @@ public class InspectionRecordServiceImpl implements InspectionRecordService { return record.getId(); } + @Override + public PageResult getRecordPage(InspectionRecordPageReqVO pageReqVO) { + return inspectionRecordMapper.selectPage(pageReqVO, new LambdaQueryWrapperX() + .eqIfPresent(OpsInspectionRecordDO::getAreaId, pageReqVO.getAreaId()) + .eqIfPresent(OpsInspectionRecordDO::getInspectorId, pageReqVO.getInspectorId()) + .eqIfPresent(OpsInspectionRecordDO::getResultStatus, pageReqVO.getResultStatus()) + .betweenIfPresent(OpsInspectionRecordDO::getCreateTime, pageReqVO.getCreateTime()) + .orderByDesc(OpsInspectionRecordDO::getId)); + } + } diff --git a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/inspection/InspectionController.java b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/inspection/InspectionController.java index 3f9793c..8ad3991 100644 --- a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/inspection/InspectionController.java +++ b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/inspection/InspectionController.java @@ -1,10 +1,11 @@ package com.viewsh.module.ops.controller.admin.inspection; import com.viewsh.framework.common.pojo.CommonResult; +import com.viewsh.framework.common.pojo.PageResult; +import com.viewsh.framework.common.util.object.BeanUtils; import com.viewsh.framework.security.core.util.SecurityFrameworkUtils; -import com.viewsh.module.ops.environment.controller.admin.inspection.vo.DetectedBeaconVO; -import com.viewsh.module.ops.environment.controller.admin.inspection.vo.InspectionSubmitReqVO; -import com.viewsh.module.ops.environment.controller.admin.inspection.vo.LocationVerifyResultVO; +import com.viewsh.module.ops.environment.controller.admin.inspection.vo.*; +import com.viewsh.module.ops.environment.dal.dataobject.inspection.OpsInspectionRecordDO; import com.viewsh.module.ops.environment.service.inspection.InspectionLocationService; import com.viewsh.module.ops.environment.service.inspection.InspectionRecordService; import io.swagger.v3.oas.annotations.Operation; @@ -53,4 +54,12 @@ public class InspectionController { return success(inspectionRecordService.submitInspection(submitReqVO, inspectorId)); } + @GetMapping("/record/page") + @Operation(summary = "获得巡检记录分页") + @PreAuthorize("@ss.hasPermission('ops:inspection:query')") + public CommonResult> getRecordPage(@Valid InspectionRecordPageReqVO pageReqVO) { + PageResult pageResult = inspectionRecordService.getRecordPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, InspectionRecordRespVO.class)); + } + }