From 9051d6194b11a2151bd62b9be731689524a32d5a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 12:58:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/inspection/ArdInspectionGroupController.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/inspection/ArdInspectionGroupController.java b/ard-admin/src/main/java/com/ard/web/controller/inspection/ArdInspectionGroupController.java
index 06b8006..d7de851 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/inspection/ArdInspectionGroupController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/inspection/ArdInspectionGroupController.java
@@ -1,14 +1,11 @@
package com.ard.web.controller.inspection;
import java.util.List;
-import javax.servlet.http.HttpServletResponse;
import com.ard.common.annotation.Log;
import com.ard.common.core.controller.BaseController;
import com.ard.common.core.domain.AjaxResult;
-import com.ard.common.core.page.TableDataInfo;
import com.ard.common.enums.BusinessType;
-import com.ard.common.utils.poi.ExcelUtil;
import com.ard.inspection.domain.ArdInspectionGroup;
import com.ard.inspection.service.IArdInspectionGroupService;
import io.swagger.annotations.Api;
@@ -42,7 +39,7 @@
* 查询精细化巡检分组列表
*/
@ApiOperation("查询精细化巡检分组列表")
- @PreAuthorize("@ss.hasPermi('inspection:group:list')")
+ //@PreAuthorize("@ss.hasPermi('inspection:group:list')")
@GetMapping("/list")
public AjaxResult list(ArdInspectionGroup ardInspectionGroup) {
List<ArdInspectionGroup> list = ardInspectionGroupService.selectArdInspectionGroupList(ardInspectionGroup);
@@ -53,7 +50,7 @@
* 获取精细化巡检分组详细信息
*/
@ApiOperation("获取精细化巡检分组详细信息")
- @PreAuthorize("@ss.hasPermi('inspection:group:query')")
+ //@PreAuthorize("@ss.hasPermi('inspection:group:query')")
@GetMapping(value = "/{groupId}")
public AjaxResult getInfo(@PathVariable("groupId") Long groupId) {
//ardInspectionGroupService.checkInspectionGroupDataScope(groupId);
@@ -64,11 +61,11 @@
* 新增精细化巡检分组
*/
@ApiOperation("新增精细化巡检分组")
- @PreAuthorize("@ss.hasPermi('inspection:group:add')")
+ //@PreAuthorize("@ss.hasPermi('inspection:group:add')")
@Log(title = "精细化巡检分组", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdInspectionGroup ardInspectionGroup) {
- if (ardInspectionGroupService.checkInspectionGroupNameUnique(ardInspectionGroup)){
+ if (!ardInspectionGroupService.checkInspectionGroupNameUnique(ardInspectionGroup)){
return error("新增分组'" + ardInspectionGroup.getGroupName() + "'失败，分组名称已存在");
}
ardInspectionGroup.setCreateBy(getUsername());
@@ -79,7 +76,7 @@
* 修改精细化巡检分组
*/
@ApiOperation("修改精细化巡检分组")
- @PreAuthorize("@ss.hasPermi('inspection:group:edit')")
+ //@PreAuthorize("@ss.hasPermi('inspection:group:edit')")
@Log(title = "精细化巡检分组", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArdInspectionGroup ardInspectionGroup) {
@@ -98,7 +95,7 @@
* 删除精细化巡检分组
*/
@ApiOperation("删除精细化巡检分组")
- @PreAuthorize("@ss.hasPermi('inspection:group:remove')")
+ //@PreAuthorize("@ss.hasPermi('inspection:group:remove')")
@Log(title = "精细化巡检分组", businessType = BusinessType.DELETE)
@DeleteMapping("/{groupId}")
public AjaxResult remove(@PathVariable Long groupId) {
@@ -112,4 +109,14 @@
return toAjax(ardInspectionGroupService.deleteArdInspectionGroupByGroupId(groupId));
}
+ /**
+ * 获取巡检分组树列表
+ */
+ @ApiOperation("获取巡检分组树列表")
+ //@PreAuthorize("@ss.hasPermi('inspection:group:groupTree')")
+ @GetMapping("/groupTree")
+ public AjaxResult deptTree(ArdInspectionGroup ardInspectionGroup) {
+ return success(ardInspectionGroupService.selectGroupTreeList(ardInspectionGroup));
+ }
+
}
--
Gitblit v1.9.3