Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

5 天以前 0d7d874912d0147376826b55667a1deb6547ed91

 src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java

@@ -5,7 +5,8 @@
import com.ruoyi.approve.pojo.KnowledgeBase;
import com.ruoyi.approve.service.KnowledgeBaseService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -18,7 +19,7 @@
@RequestMapping("/knowledgeBase")
@AllArgsConstructor
@Tag(name = "知识库管理")
public class KnowledgeBaseController {
public class KnowledgeBaseController extends BaseController {
    private KnowledgeBaseService knowledgeBaseService;

    /**、
@@ -26,35 +27,35 @@
     * @return
     */
    @GetMapping("/getList")
    public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
    public R<?> getList(@RequestParam(defaultValue = "1") long current,
                              @RequestParam(defaultValue = "10") long size, KnowledgeBase knowledgeBase) {
        Page page = new Page(current, size);
        return AjaxResult.success(knowledgeBaseService.listpage(page,knowledgeBase));
        return R.ok(knowledgeBaseService.listpage(page,knowledgeBase));
    }
    /**、
     * 增添
     * @return
     */
    @PostMapping("/add")
    public AjaxResult add(@RequestBody KnowledgeBase knowledgeBase){
        return AjaxResult.success(knowledgeBaseService.save(knowledgeBase));
    public R<?> add(@RequestBody KnowledgeBase knowledgeBase){
        return R.ok(knowledgeBaseService.save(knowledgeBase));
    }
    /**
     * 更新
     * @return
     */
    @PostMapping("/update")
    public AjaxResult update(@RequestBody KnowledgeBase knowledgeBase){
        return AjaxResult.success(knowledgeBaseService.updateById(knowledgeBase));
    public R<?> update(@RequestBody KnowledgeBase knowledgeBase){
        return R.ok(knowledgeBaseService.updateById(knowledgeBase));
    }
    /**
     * 删除
     * @return
     */
    @DeleteMapping("/delete")
    public AjaxResult delete(@RequestBody List<Long> ids){
        if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("请传入要删除的ID");
        return AjaxResult.success(knowledgeBaseService.removeByIds(ids));
    public R<?> delete(@RequestBody List<Long> ids){
        if(CollectionUtils.isEmpty(ids)) return R.fail("请传入要删除的ID");
        return R.ok(knowledgeBaseService.removeByIds(ids));
    }

    @Operation(summary = "知识库管理导出")