|
@@ -123,12 +123,12 @@ public class RiskInspectionTaskController extends BaseController {
|
|
|
return R.ok(inspectionTaskService.queryRecordListByTaskId(taskId));
|
|
return R.ok(inspectionTaskService.queryRecordListByTaskId(taskId));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // ===================== 移动端接口(免 Sa-Token 权限,移动端走 token 头鉴权) =====================
|
|
|
|
|
|
|
+ // ===================== 移动端接口(免登录) =====================
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 移动端-查询我的巡检任务列表(分页,带打卡状态)
|
|
* 移动端-查询我的巡检任务列表(分页,带打卡状态)
|
|
|
*
|
|
*
|
|
|
- * @param inspectorId 巡检人ID(可空,空则取当前登录用户)
|
|
|
|
|
|
|
+ * @param inspectorId 巡检人ID(可空,空则默认取 admin 用户,用于演示)
|
|
|
* @param status 任务状态: PENDING-待打卡 / PUNCHED-已打卡 / OVERDUE-已逾期 / FINISHED-已完成
|
|
* @param status 任务状态: PENDING-待打卡 / PUNCHED-已打卡 / OVERDUE-已逾期 / FINISHED-已完成
|
|
|
*/
|
|
*/
|
|
|
@GetMapping("/mobileList")
|
|
@GetMapping("/mobileList")
|
|
@@ -136,6 +136,10 @@ public class RiskInspectionTaskController extends BaseController {
|
|
|
@RequestParam(required = false) Long inspectorId,
|
|
@RequestParam(required = false) Long inspectorId,
|
|
|
@RequestParam(required = false) String status,
|
|
@RequestParam(required = false) String status,
|
|
|
PageQuery pageQuery) {
|
|
PageQuery pageQuery) {
|
|
|
|
|
+ // 演示阶段未登录,默认查询 admin(id=1)的任务
|
|
|
|
|
+ if (inspectorId == null) {
|
|
|
|
|
+ inspectorId = 1L;
|
|
|
|
|
+ }
|
|
|
return inspectionTaskService.queryMobileList(inspectorId, status, pageQuery);
|
|
return inspectionTaskService.queryMobileList(inspectorId, status, pageQuery);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -150,13 +154,11 @@ public class RiskInspectionTaskController extends BaseController {
|
|
|
/**
|
|
/**
|
|
|
* 移动端-校验二维码内容
|
|
* 移动端-校验二维码内容
|
|
|
*
|
|
*
|
|
|
- * @param taskId 任务ID
|
|
|
|
|
- * @param qrCode 扫码得到的字符串
|
|
|
|
|
|
|
+ * @param bo 任务ID + 二维码内容
|
|
|
*/
|
|
*/
|
|
|
@PostMapping("/verifyQr")
|
|
@PostMapping("/verifyQr")
|
|
|
- public R<Boolean> verifyQr(@NotNull(message = "任务ID不能为空") @RequestParam Long taskId,
|
|
|
|
|
- @NotBlank(message = "二维码内容不能为空") @RequestParam String qrCode) {
|
|
|
|
|
- return R.ok(inspectionTaskService.verifyQrCode(taskId, qrCode));
|
|
|
|
|
|
|
+ public R<Boolean> verifyQr(@RequestBody org.dromara.risk.domain.bo.VerifyQrBo bo) {
|
|
|
|
|
+ return R.ok(inspectionTaskService.verifyQrCode(bo.getTaskId(), bo.getQrCode()));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|