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

zhaowenyu

2025-10-15 a9780c49f8cf587af26cc83d439320ad02b8668f

 ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java

@@ -3,8 +3,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;

import com.ard.data.domain.ArdMapManagement;
import com.ard.data.service.IArdMapManagementService;
import com.ard.system.data.domain.ArdMapManagement;
import com.ard.system.data.service.IArdMapManagementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -32,7 +32,7 @@
 */
@Api(tags = "地图管理接口")
@RestController
@RequestMapping("/data/management")
@RequestMapping("/data/map")
public class ArdMapManagementController extends BaseController {

    @Autowired
@@ -42,7 +42,7 @@
     * 查询地图管理列表
     */
    @ApiOperation("查询地图管理列表")
    @PreAuthorize("@ss.hasPermi('system:management:list')")
    @PreAuthorize("@ss.hasPermi('system:map:list')")
    @GetMapping("/list")
    public TableDataInfo list(ArdMapManagement ardMapManagement) {
        startPage();
@@ -54,7 +54,7 @@
     * 导出地图管理列表
     */
    @ApiOperation("导出地图管理列表")
    @PreAuthorize("@ss.hasPermi('system:management:export')")
    @PreAuthorize("@ss.hasPermi('system:map:export')")
    @Log(title = "地图管理", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ArdMapManagement ardMapManagement) {
@@ -67,7 +67,7 @@
     * 获取地图管理详细信息
     */
    @ApiOperation("获取地图管理详细信息")
    @PreAuthorize("@ss.hasPermi('system:management:query')")
    @PreAuthorize("@ss.hasPermi('system:map:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id) {
        return success(ardMapManagementService.selectArdMapManagementById(id));
@@ -77,7 +77,7 @@
     * 新增地图管理
     */
    @ApiOperation("新增地图管理")
    @PreAuthorize("@ss.hasPermi('system:management:add')")
    @PreAuthorize("@ss.hasPermi('system:map:add')")
    @Log(title = "地图管理", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ArdMapManagement ardMapManagement) {
@@ -88,7 +88,7 @@
     * 修改地图管理
     */
    @ApiOperation("修改地图管理")
    @PreAuthorize("@ss.hasPermi('system:management:edit')")
    @PreAuthorize("@ss.hasPermi('system:map:edit')")
    @Log(title = "地图管理", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ArdMapManagement ardMapManagement) {
@@ -99,7 +99,7 @@
     * 删除地图管理
     */
    @ApiOperation("删除地图管理")
    @PreAuthorize("@ss.hasPermi('system:management:remove')")
    @PreAuthorize("@ss.hasPermi('system:map:remove')")
    @Log(title = "地图管理", businessType = BusinessType.DELETE)
   @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids) {