From 27fff67070616dacd6c5af18d07a988d28a04de7 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 九月 2025 17:35:58 +0800
Subject: [PATCH] 个人记事本新增结束时间

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java |   48 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java
index d90baaa..a6ca3f3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java
@@ -4,12 +4,19 @@
 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.domain.entity.SysUser;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.ZIdea;
+import com.ruoyi.service.ZIdeaDownloadService;
 import com.ruoyi.service.ZIdeaService;
+import com.ruoyi.service.ZIdeaShareService;
+import com.ruoyi.service.ZPropertyDownloadService;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -39,6 +46,16 @@
     @Autowired
     private ZIdeaService zIdeaService;
 
+    @Autowired
+    private ZIdeaDownloadService zIdeaDownloadService;
+
+    @Autowired
+    private ZIdeaShareService zIdeaShareService;
+
+    @Autowired
+    private ISysUserService sysUserService;
+
+
     /**
      * 鏌ヨ鎵�鏈夎褰�
      */
@@ -60,7 +77,7 @@
     /**
      * 妯℃澘
      */
-    @GetMapping("/model")
+    @PostMapping("/model")
     public void getModel(HttpServletResponse response){
         ZIdea zIdea = new ZIdea();
         List<ZIdea> emptyList = Collections.singletonList(zIdea);
@@ -72,6 +89,13 @@
     @PostMapping("/export")
     public void export(HttpServletResponse response)
     {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Boolean userStatus = sysUserService.findUserStatus(user.getUserId());
+
+        if(userStatus) {
+             throw new IllegalArgumentException("鎮ㄧ殑璇曠敤鏈熷凡缁忕粨鏉燂紝璇蜂粯璐圭户缁娇鐢�");
+
+        }
         List<ZIdea> list = zIdeaService.selectByCondition();
         log.info("瀵煎嚭璁板綍涓�:{}",list);
         ExcelUtil<ZIdea> util = new ExcelUtil<>(ZIdea.class);
@@ -99,7 +123,10 @@
     @PostMapping("/importData")
     public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
     {
-        return zIdeaService.importExcel(file);
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Boolean userStatus = sysUserService.findUserStatus(user.getUserId());
+
+        return userStatus?AjaxResult.error("鎮ㄧ殑璇曠敤鏈熷凡缁忕粨鏉燂紝璇蜂粯璐圭户缁娇鐢�"):zIdeaService.importExcel(file);
     }
 
     /**
@@ -110,7 +137,10 @@
     @PostMapping
     public AjaxResult add(@RequestBody ZIdea zIdea)
     {
-        return zIdeaService.mySave(zIdea);
+
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Boolean userStatus = sysUserService.findUserStatus(user.getUserId());
+        return userStatus?AjaxResult.error("鎮ㄧ殑璇曠敤鏈熷凡缁忕粨鏉燂紝璇蜂粯璐圭户缁娇鐢�"):zIdeaService.mySave(zIdea);
     }
 
     /**
@@ -121,7 +151,9 @@
     @PutMapping
     public AjaxResult edit(@RequestBody ZIdea zIdea)
     {
-        return toAjax(zIdeaService.updateById(zIdea));
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Boolean userStatus = sysUserService.findUserStatus(user.getUserId());
+        return userStatus?AjaxResult.error("鎮ㄧ殑璇曠敤鏈熷凡缁忕粨鏉燂紝璇蜂粯璐圭户缁娇鐢�"):toAjax(zIdeaService.updateById(zIdea));
     }
 //
     /**
@@ -132,7 +164,13 @@
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(zIdeaService.removeByIds(Arrays.asList(ids)));
+
+        if (! (zIdeaDownloadService.deleteData(ids) && zIdeaShareService.deleteByContentId(ids)  ) ){
+            return AjaxResult.error();
+        }
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Boolean userStatus = sysUserService.findUserStatus(user.getUserId());
+        return userStatus?AjaxResult.error("鎮ㄧ殑璇曠敤鏈熷凡缁忕粨鏉燂紝璇蜂粯璐圭户缁娇鐢�"): toAjax(zIdeaService.removeByIds(Arrays.asList(ids)));
     }
 
 }

--
Gitblit v1.9.1