From 81995abfa712d65b7f7f1e23b97a97bc4065103d Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 25 十月 2024 23:11:30 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java | 137 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 134 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
index c62d659..f1c76e1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
@@ -1,9 +1,31 @@
package com.ruoyi.web.controller.zhang;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.enums.BusinessType;
+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 org.springframework.web.bind.annotation.RestController;
+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;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
* <p>
@@ -15,7 +37,116 @@
*/
@RestController
@RequestMapping("/zSelfNote")
-public class ZSelfNoteController {
+@Slf4j
+public class ZSelfNoteController extends BaseController {
+ @Autowired
+ private ZSelfNoteService zSelfNoteService;
+
+ @Autowired
+ private ZSelfNoteShareService zSelfNoteShareService;
+
+ @Autowired
+ private ZSelfNoteDownloadService zSelfNoteDownloadService;
+
+
+ /**
+ * 鏌ヨ鎵�鏈夎褰�
+ */
+ @GetMapping("/all")
+ public AjaxResult listAll(ZSelfNote zSelfNote){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zSelfNoteService.selectDataList(zSelfNote,pageNum,pageSize);
+ }
+
+ /**
+ * 鏍规嵁id鏌ヨ
+ */
+ @GetMapping()
+ public AjaxResult listById(@PathParam("id") Long id){
+ return AjaxResult.success(zSelfNoteService.getById(id));
+ }
+
+ /**
+ * 妯℃澘
+ */
+ @PostMapping("/model")
+ public void getModel(HttpServletResponse response){
+ ZSelfNote zSelfNote = new ZSelfNote();
+ List<ZSelfNote> emptyList = Collections.singletonList(zSelfNote);
+ ExcelUtil<ZSelfNote> util = new ExcelUtil<>(ZSelfNote.class);
+ util.exportExcel(response, emptyList, "涓汉璁颁簨鏈褰曟暟鎹�");
+ }
+
+ /**
+ * 瀵煎嚭涓汉璁颁簨鏈褰曞垪琛�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "涓汉璁颁簨鏈褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response)
+ {
+ List<ZSelfNote> list = zSelfNoteService.selectByCondition();
+ 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);
+ ExcelUtil<ZSelfNote> util = new ExcelUtil<>(ZSelfNote.class);
+ util.exportExcel(response, list, "涓汉璁颁簨鏈褰曟暟鎹�");
+ }
+
+ /**
+ * 瀵煎叆涓汉璁颁簨鏈褰曞垪琛�
+ */
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
+ {
+ return zSelfNoteService.importExcel(file);
+ }
+
+ /**
+ * 鏂板涓汉璁颁簨鏈褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:add')")
+ @Log(title = "涓汉璁颁簨鏈褰�", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ZSelfNote zSelfNote)
+ {
+ return zSelfNoteService.mySave(zSelfNote);
+ }
+
+ /**
+ * 淇敼涓汉璁颁簨鏈褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:edit')")
+ @Log(title = "涓汉璁颁簨鏈褰�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ZSelfNote zSelfNote)
+ {
+ return toAjax(zSelfNoteService.updateById(zSelfNote));
+ }
+//
+ /**
+ * 鎵归噺鍒犻櫎涓汉璁颁簨鏈褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:remove')")
+ @Log(title = "涓汉璁颁簨鏈褰�", businessType = BusinessType.DELETE)
+ @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)));
+ }
}
--
Gitblit v1.9.1