From 214a602ece047dbb38c1aebf3e854122f52c20d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Wed, 26 Jul 2023 10:57:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A1=E6=A3=80=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=97=A5=E5=BF=97=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzinfo/inspect/ai/controller/CameraInfoController.java | 4 ++++ .../java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java | 2 +- .../com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java | 2 +- .../java/com/hnac/hzinfo/inspect/ai/controller/RobotController.java | 2 +- .../main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java | 2 +- .../main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java | 2 +- .../java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java | 2 +- .../main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java | 2 +- .../main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java | 4 ++-- .../java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java | 2 +- .../java/com/hnac/hzinfo/inspect/task/controller/TaskController.java | 2 +- .../hzims/operational/access/controller/OperAccessPlanController.java | 2 +- 12 files changed, 16 insertions(+), 12 deletions(-) diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/CameraInfoController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/CameraInfoController.java index f056d4d..93bb4e5 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/CameraInfoController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/CameraInfoController.java @@ -80,6 +80,10 @@ public class CameraInfoController extends BladeController { @ApiImplicitParam(name = "isControl", value = "是否云台控制", paramType = "query", dataType = "Integer"), @ApiImplicitParam(name = "isHikvideo", value = "是否平台接入", paramType = "query", dataType = "Integer"), }) + @OperationAnnotation(moduleName = "巡检管理", title = "智能巡检配置", + operatorType = OperatorType.MOBILE, + businessType = BusinessType.GENCODE, + action = "查询巡检摄像头管理列表") public R> list(@ApiIgnore @RequestParam Map cameraInfo, Query query) { QueryWrapper queryWrapper = new QueryWrapper<>(); if (!Func.isEmpty(cameraInfo.get("tenantId"))) { diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java index f1d4513..c3d1b9d 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java @@ -59,7 +59,7 @@ public class ClockController extends BladeController { @OperationAnnotation(moduleName = "巡检管理", title = "智能巡检配置", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, - action = "分页") + action = "分页查询表盘记录列表") public R> list(@ApiIgnore @RequestParam Map st_clock, Query query) { QueryWrapper queryWrapper = Condition.getQueryWrapper( st_clock, ClockEntity.class); IPage pages = st_clockService.page(Condition.getPage(query), queryWrapper); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java index 8d364e5..54eaeb0 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java @@ -57,7 +57,7 @@ public class ClockTypeController extends BladeController { @OperationAnnotation(moduleName = "巡检管理", title = "智能巡检配置", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, - action = "分页") + action = "分页查询表盘类型列表") public R> list(@ApiIgnore @RequestParam Map st_clock_type, Query query) { QueryWrapper queryWrapper = Condition.getQueryWrapper( st_clock_type, ClockTypeEntity.class); IPage pages = st_clock_typeService.page(Condition.getPage(query), queryWrapper); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotController.java index a7185fb..8454994 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotController.java @@ -66,7 +66,7 @@ public class RobotController extends BladeController { @OperationAnnotation(moduleName = "巡检管理", title = "机器人管理", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, - action = "分页") + action = "分页查询机器人管理列表") public R> list(@ApiIgnore @RequestParam Map st_robot, Query query) { QueryWrapper queryWrapper = Condition.getQueryWrapper( st_robot, RobotEntity.class); IPage pages = st_robotService.page(Condition.getPage(query), queryWrapper); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java index 76ee5ec..f6b2045 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java @@ -56,7 +56,7 @@ public class ContentController { @ApiOperation(value = "巡检内容列表", notes = "巡检内容列表") @OperationAnnotation(moduleName = "巡检管理",title = "巡检配置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "巡检对象列表") + action = "查询巡检内容管理列表") public R> list(ContentListQueryVO content, Query query, BladeUser bladeUser) { LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new ContentEntity(),content); queryWrapper.orderByDesc(ContentEntity::getUpdateTime); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java index 4a59031..ac491bc 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java @@ -91,7 +91,7 @@ public class ObjectController extends BladeController { @ApiOperation(value = "巡检对象列表", notes = "巡检对象列表") @OperationAnnotation(moduleName = "巡检管理",title = "巡检配置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "巡检对象列表") + action = "查询巡检对象管理列表") public R> list(ObjectListQueryVO object, Query query, BladeUser bladeUser) { IPage pages = Condition.getPage(query); ObjectEntity entity = new ObjectEntity(); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java index cfc380c..64fe5ba 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java @@ -61,7 +61,7 @@ public class ObjectUserController { @OperationAnnotation(moduleName = "巡检管理", title = "巡检配置", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, - action = "巡检对象用户列表") + action = "查询巡检对象人员管理列表") @ApiOperation(value = "巡检对象用户列表", notes = "巡检对象用户列表(跨服务查询)") public R> list(ObjectUserListQuery content, Query query, BladeUser bladeUser) { if(!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)){ diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java index cedc7c7..24d0086 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java @@ -67,7 +67,7 @@ public class ProjectController { @ApiOperation(value = "巡检项目列表", notes = "巡检项目列表") @OperationAnnotation(moduleName = "巡检管理",title = "巡检配置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "巡检对象列表") + action = "查询巡检项目管理列表") public R> list(ProjectListQueryVO project, Query query, BladeUser bladeUser) { LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new ProjectEntity(),project); queryWrapper.orderByDesc(ProjectEntity::getUpdateTime); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java index 52c5f70..a643a3f 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java @@ -69,9 +69,9 @@ public class TemplateController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "巡检模板列表分页", notes = "传入巡检模板") - @OperationAnnotation(moduleName = "巡检管理",title = "巡检配置",operatorType = OperatorType.MOBILE,businessType = + @OperationAnnotation(moduleName = "巡检管理",title = "模板配置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "巡检对象列表") + action = "查询巡检模板管理列表") public R> list(TemplateListQueryVO inspectionTemplate, Query query, BladeUser bladeUser) { LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new TemplateEntity(),inspectionTemplate); queryWrapper.orderByDesc(TemplateEntity::getUpdateTime); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java index 57488ad..fb1ab29 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java @@ -61,7 +61,7 @@ public class RouteController extends BladeController { @OperationAnnotation(moduleName = "巡检管理", title = "巡检配置", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, - action = "列表(不分页)") + action = "查询巡检路径管理列表") public R> list(@ApiIgnore @RequestParam Map st_re_route, Query query) { QueryWrapper queryWrapper = Condition.getQueryWrapper(st_re_route, RouteEntity.class); queryWrapper.orderByDesc("create_time", "update_time"); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java index dbbe93c..340c05f 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java @@ -179,7 +179,7 @@ public class TaskController extends BladeController { @OperationAnnotation(moduleName = "巡检管理", title = "视频巡检任务", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, - action = "视频任务列表") + action = "查询视频巡检任务列表") @ApiOperation(value = "视频任务列表", notes = "传入task") public R> videoList(TaskListQuery task, Query query) { IPage pages = Condition.getPage(query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessPlanController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessPlanController.java index a92e633..4a877da 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessPlanController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessPlanController.java @@ -126,7 +126,7 @@ public class OperAccessPlanController extends BladeController { @ApiOperationSupport(order = 50) @OperationAnnotation(moduleName = "检修管理",title = "检修计划",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页 查询参数:code,name,gradeCode,manager,techLead,handleStatus,status") + action = "分页查询检修计划列表") @ApiOperation(value = "分页 查询参数:code,name,gradeCode,manager,techLead,handleStatus,status") public R> list(OperAccessPlanListDTO req, Query query) { return service.list(req, query);