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

zhaowenyu

2025-10-14 f905f4377db462640a4fdd53dc5daa1adfc8c542

 ard-admin/src/main/java/com/ard/web/controller/work/ArdServerInfoController.java

File was renamed from ard-admin/src/main/java/com/ard/web/controller/work/ArdServerController.java
@@ -4,7 +4,7 @@
import javax.servlet.http.HttpServletResponse;

import com.ard.work.domain.entity.ArdServerInfo;
import com.ard.work.service.IArdServerService;
import com.ard.work.service.IArdServerInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,20 +33,20 @@
@Api(tags = "服务器管理接口")
@RestController
@RequestMapping("/uav/server")
public class ArdServerController extends BaseController {
public class ArdServerInfoController extends BaseController {

    @Autowired
    private IArdServerService ardServerManagementService;
    private IArdServerInfoService ardServerInfoService;

    /**
     * 查询服务器管理列表
     */
    @ApiOperation("查询服务器管理列表")
    @PreAuthorize("@ss.hasPermi('system:management:list')")
    @PreAuthorize("@ss.hasPermi('work:server:list')")
    @GetMapping("/list")
    public TableDataInfo list(ArdServerInfo ardServerInfo) {
        startPage();
        List<ArdServerInfo> list = ardServerManagementService.selectArdServerManagementList(ardServerInfo);
        List<ArdServerInfo> list = ardServerInfoService.selectArdServerInfoList(ardServerInfo);
        return getDataTable(list);
    }

@@ -54,11 +54,11 @@
     * 导出服务器管理列表
     */
    @ApiOperation("导出服务器管理列表")
    @PreAuthorize("@ss.hasPermi('system:management:export')")
    @PreAuthorize("@ss.hasPermi('work:server:export')")
    @Log(title = "服务器管理", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ArdServerInfo ardServerInfo) {
        List<ArdServerInfo> list = ardServerManagementService.selectArdServerManagementList(ardServerInfo);
        List<ArdServerInfo> list = ardServerInfoService.selectArdServerInfoList(ardServerInfo);
        ExcelUtil<ArdServerInfo> util = new ExcelUtil<ArdServerInfo>(ArdServerInfo.class);
        util.exportExcel(response, list, "服务器管理数据");
    }
@@ -67,43 +67,43 @@
     * 获取服务器管理详细信息
     */
    @ApiOperation("获取服务器管理详细信息")
    @PreAuthorize("@ss.hasPermi('system:management:query')")
    @PreAuthorize("@ss.hasPermi('work:server:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id) {
        return success(ardServerManagementService.selectArdServerManagementById(id));
        return success(ardServerInfoService.selectArdServerInfoById(id));
    }

    /**
     * 新增服务器管理
     */
    @ApiOperation("新增服务器管理")
    @PreAuthorize("@ss.hasPermi('system:management:add')")
    @PreAuthorize("@ss.hasPermi('work:server:add')")
    @Log(title = "服务器管理", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ArdServerInfo ardServerInfo) {
        return toAjax(ardServerManagementService.insertArdServerManagement(ardServerInfo));
        return toAjax(ardServerInfoService.insertArdServerInfo(ardServerInfo));
    }

    /**
     * 修改服务器管理
     */
    @ApiOperation("修改服务器管理")
    @PreAuthorize("@ss.hasPermi('system:management:edit')")
    @PreAuthorize("@ss.hasPermi('work:server:edit')")
    @Log(title = "服务器管理", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ArdServerInfo ardServerInfo) {
        return toAjax(ardServerManagementService.updateArdServerManagement(ardServerInfo));
        return toAjax(ardServerInfoService.updateArdServerInfo(ardServerInfo));
    }

    /**
     * 删除服务器管理
     */
    @ApiOperation("删除服务器管理")
    @PreAuthorize("@ss.hasPermi('system:management:remove')")
    @PreAuthorize("@ss.hasPermi('work:server:remove')")
    @Log(title = "服务器管理", businessType = BusinessType.DELETE)
   @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids) {
        return toAjax(ardServerManagementService.deleteArdServerManagementByIds(ids));
        return toAjax(ardServerInfoService.deleteArdServerInfoByIds(ids));
    }

}