Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java

@@ -9,13 +9,17 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZSelfNote;
import com.ruoyi.service.ZSelfNoteDownloadService;
import com.ruoyi.service.ZSelfNoteService;
import com.ruoyi.service.ZSelfNoteShareService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.websocket.server.PathParam;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -38,6 +42,15 @@
    @Autowired
    private ZSelfNoteService zSelfNoteService;

    @Autowired
    private ZSelfNoteShareService zSelfNoteShareService;

    @Autowired
    private ZSelfNoteDownloadService zSelfNoteDownloadService;




    /**
     * 查询所有记录
     */
@@ -52,14 +65,14 @@
     * 根据id查询
     */
    @GetMapping()
    public AjaxResult listById(Long id){
    public AjaxResult listById(@PathParam("id") Long id){
        return AjaxResult.success(zSelfNoteService.getById(id));
    }

    /**
     * 模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getModel(HttpServletResponse response){
        ZSelfNote zSelfNote = new ZSelfNote();
        List<ZSelfNote> emptyList = Collections.singletonList(zSelfNote);
@@ -72,8 +85,20 @@
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "个人记事本记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export/{ids}")
    public void export(HttpServletResponse response,@PathVariable Long[] ids)
    @PostMapping("/export")
    public void export(HttpServletResponse response)
    {
        List<ZSelfNote> list = zSelfNoteService.selectByCondition();
        log.info("导出记录为:{}",list);
        log.info("导出记录为:{}",list);

        ExcelUtil<ZSelfNote> util = new ExcelUtil<>(ZSelfNote.class);
        util.exportExcel(response, list, "个人记事本记录数据");
    }

    @Log(title = "个人记事本记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export1(HttpServletResponse response,@PathVariable Long[] ids)
    {
        List<ZSelfNote> list = zSelfNoteService.selectByIds(ids);
        log.info("导出记录为:{}",list);
@@ -121,6 +146,9 @@
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        if (! (zSelfNoteDownloadService.deleteData(ids) && zSelfNoteShareService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }
        return toAjax(zSelfNoteService.removeByIds(Arrays.asList(ids)));
    }