Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2026-03-07 d7fef91a4cbb702988dc820bcde82c166253ceec

 ard-admin/src/main/java/com/ard/web/controller/inspection/ArdInspectionGroupController.java

@@ -39,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);
@@ -50,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);
@@ -61,7 +61,7 @@
     * 新增精细化巡检分组
     */
    @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) {
@@ -76,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) {
@@ -95,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) {
@@ -113,7 +113,7 @@
     * 获取巡检分组树列表
     */
    @ApiOperation("获取巡检分组树列表")
    @PreAuthorize("@ss.hasPermi('inspection:group:groupTree')")
    //@PreAuthorize("@ss.hasPermi('inspection:group:groupTree')")
    @GetMapping("/groupTree")
    public AjaxResult deptTree(ArdInspectionGroup ardInspectionGroup) {
        return success(ardInspectionGroupService.selectGroupTreeList(ardInspectionGroup));