zhou zhou
昨天 1dcfa3702505f0c431757312b5304531029f90f6
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
@@ -15,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@@ -36,25 +37,25 @@
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<TaskPathTemplateMerge, BaseParam> pageParam = new PageParam<>(baseParam, TaskPathTemplateMerge.class);
        return R.ok().add(taskPathTemplateMergeService.page(pageParam, pageParam.buildWrapper(true)));
        return R.ok().add(buildPageRowsUtils.rowsMap(taskPathTemplateMergeService.page(pageParam, pageParam.buildWrapper(true))));
    }
    @PreAuthorize("hasAuthority('system:taskPathTemplateMerge:list')")
    @PostMapping("/taskPathTemplateMerge/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(taskPathTemplateMergeService.list());
        return R.ok().add(buildPageRowsUtils.rowsMap(taskPathTemplateMergeService.list()));
    }
    @PreAuthorize("hasAuthority('system:taskPathTemplateMerge:list')")
    @PostMapping({"/taskPathTemplateMerge/many/{ids}", "/taskPathTemplateMerges/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(taskPathTemplateMergeService.listByIds(Arrays.asList(ids)));
        return R.ok().add(buildPageRowsUtils.rowsMap(taskPathTemplateMergeService.listByIds(Arrays.asList(ids))));
    }
    @PreAuthorize("hasAuthority('system:taskPathTemplateMerge:list')")
    @GetMapping("/taskPathTemplateMerge/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(taskPathTemplateMergeService.getById(id));
        return R.ok().add(buildPageRowsUtils.rowsMap(taskPathTemplateMergeService.getById(id)));
    }
    @PreAuthorize("hasAuthority('system:taskPathTemplateMerge:save')")
@@ -84,7 +85,7 @@
                }
            }
        }
        return R.ok("Save Success").add(taskPathTemplateMerges);
        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(taskPathTemplateMerges));
    }
    @PreAuthorize("hasAuthority('system:taskPathTemplateMerge:update')")
@@ -96,7 +97,7 @@
        if (!taskPathTemplateMergeService.updateById(taskPathTemplateMerge)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(taskPathTemplateMerge);
        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(taskPathTemplateMerge));
    }
    @PreAuthorize("hasAuthority('system:taskPathTemplateMerge:remove')")
@@ -106,7 +107,7 @@
        if (!taskPathTemplateMergeService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        }
        return R.ok("Delete Success").add(ids);
        return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
    }
    @PreAuthorize("hasAuthority('system:taskPathTemplateMerge:list')")
@@ -120,13 +121,13 @@
        taskPathTemplateMergeService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getId()))
        );
        return R.ok().add(vos);
        return R.ok().add(buildPageRowsUtils.rowsMap(vos));
    }
    @PreAuthorize("hasAuthority('system:taskPathTemplateMerge:list')")
    @PostMapping("/taskPathTemplateMerge/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(taskPathTemplateMergeService.list(), TaskPathTemplateMerge.class), response);
        ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(taskPathTemplateMergeService.list()), TaskPathTemplateMerge.class), response);
    }
}