XW-AIOT/aiot-platform-cloud
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(ops): 巡检记录分页查询接口（按区域/巡检员/结果/时间筛选）

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
lzh
2026-03-05 20:11:21 +08:00
parent 23cf3b62b2
commit 743875e65e
4 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/controller/admin/inspection/vo/InspectionRecordPageReqVO.java Normal file
View File

@@ -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;
}

11
viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/inspection/InspectionRecordService.java
View File

@@ -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<OpsInspectionRecordDO> getRecordPage(InspectionRecordPageReqVO pageReqVO);
}

13
viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/inspection/InspectionRecordServiceImpl.java
View File

@@ -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<OpsInspectionRecordDO> getRecordPage(InspectionRecordPageReqVO pageReqVO) {
return inspectionRecordMapper.selectPage(pageReqVO, new LambdaQueryWrapperX<OpsInspectionRecordDO>()
.eqIfPresent(OpsInspectionRecordDO::getAreaId, pageReqVO.getAreaId())
.eqIfPresent(OpsInspectionRecordDO::getInspectorId, pageReqVO.getInspectorId())
.eqIfPresent(OpsInspectionRecordDO::getResultStatus, pageReqVO.getResultStatus())
.betweenIfPresent(OpsInspectionRecordDO::getCreateTime, pageReqVO.getCreateTime())
.orderByDesc(OpsInspectionRecordDO::getId));
}
}

15
viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/inspection/InspectionController.java
View File

@@ -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<PageResult<InspectionRecordRespVO>> getRecordPage(@Valid InspectionRecordPageReqVO pageReqVO) {
PageResult<OpsInspectionRecordDO> pageResult = inspectionRecordService.getRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, InspectionRecordRespVO.class));
}
}