From e37d2ce605787d75fe4fc851c87e7b6c02c9b2d8 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 09 十一月 2024 17:14:51 +0800
Subject: [PATCH] 我的分享和收藏
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
index e3c2398..d2a566d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
@@ -8,9 +8,13 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.MemoBook;
import com.ruoyi.domain.ZProperty;
import com.ruoyi.domain.ZfEconomy;
+import com.ruoyi.service.MemoBookService;
+import com.ruoyi.service.ZPropertyDownloadService;
import com.ruoyi.service.ZPropertyService;
+import com.ruoyi.service.ZPropertyShareService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -39,6 +43,15 @@
@Autowired
private ZPropertyService zPropertyService;
+ @Autowired
+ private ZPropertyDownloadService zPropertyDownloadService;
+
+ @Autowired
+ private ZPropertyShareService zPropertyShareService;
+
+ @Autowired
+ private MemoBookService memoBookService;
+
/**
* 鏌ヨ鎵�鏈夎褰�
*/
@@ -47,6 +60,11 @@
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return zPropertyService.selectDataList(zProperty,pageNum,pageSize);
+ }
+
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zPropertyService.listType();
}
/**
@@ -132,6 +150,15 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ for (Long id: ids) {
+ List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(id,2026L);
+ if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
+ return AjaxResult.error();
+ }
+
+ if (! (zPropertyDownloadService.deleteData(ids) && zPropertyShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
return toAjax(zPropertyService.removeByIds(Arrays.asList(ids)));
}
--
Gitblit v1.9.1