From 86d65e6f837ff14b090ffc3312c013987b6f67d8 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 十月 2025 21:59:13 +0800
Subject: [PATCH] 荣誉 新增两个字段的查询
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java | 151 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 148 insertions(+), 3 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 fc68427..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
@@ -1,9 +1,32 @@
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.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.*;
+import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
+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 +38,129 @@
*/
@RestController
@RequestMapping("/zProperty")
-public class ZPropertyController {
+@Slf4j
+public class ZPropertyController extends BaseController {
+ @Autowired
+ private ZPropertyService zPropertyService;
+
+ @Autowired
+ private ZPropertyDownloadService zPropertyDownloadService;
+
+ @Autowired
+ private ZPropertyShareService zPropertyShareService;
+
+ @Autowired
+ private MemoBookService memoBookService;
+
+ /**
+ * 鏌ヨ鎵�鏈夎褰�
+ */
+ @GetMapping("/all")
+ public AjaxResult listAll(ZProperty zProperty){
+ 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();
+ }
+
+ /**
+ * 鏍规嵁id鏌ヨ
+ */
+ @GetMapping()
+ public AjaxResult listById(Long id){
+ return AjaxResult.success(zPropertyService.getById(id));
+ }
+
+ /**
+ * 妯℃澘
+ */
+ @PostMapping("/model")
+ public void getModel(HttpServletResponse response){
+ ZProperty zProperty = new ZProperty();
+ List<ZProperty> emptyList = Collections.singletonList(zProperty);
+ ExcelUtil<ZProperty> util = new ExcelUtil<>(ZProperty.class);
+ util.exportExcel(response, emptyList, "涓汉璐骇璁板綍鏁版嵁");
+ }
+
+ /**
+ * 瀵煎嚭涓汉璐骇璁板綍鍒楄〃
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "涓汉璐骇璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response)
+ {
+ List<ZProperty> list = zPropertyService.selectByCondition();
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZProperty> util = new ExcelUtil<>(ZProperty.class);
+ util.exportExcel(response, list, "涓汉璐骇璁板綍鏁版嵁");
+ }
+
+ @Log(title = "涓汉璐骇璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export1(HttpServletResponse response,@PathVariable Long[] ids)
+ {
+ List<ZProperty> list = zPropertyService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZProperty> util = new ExcelUtil<>(ZProperty.class);
+ util.exportExcel(response, list, "涓汉璐骇璁板綍鏁版嵁");
+ }
+
+ /**
+ * 瀵煎叆涓汉璐骇璁板綍鍒楄〃
+ */
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
+ {
+ return zPropertyService.importExcel(file);
+ }
+
+ /**
+ * 鏂板涓汉璐骇璁板綍
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:add')")
+ @Log(title = "涓汉璐骇璁板綍", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ZProperty zProperty)
+ {
+ return zPropertyService.mySave(zProperty);
+ }
+
+ /**
+ * 淇敼涓汉璐骇璁板綍
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:edit')")
+ @Log(title = "涓汉璐骇璁板綍", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ZProperty zProperty)
+ {
+ return toAjax(zPropertyService.updateById(zProperty));
+ }
+//
+ /**
+ * 鎵归噺鍒犻櫎涓汉璐骇璁板綍
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:remove')")
+ @Log(title = "涓汉璐骇璁板綍", businessType = BusinessType.DELETE)
+ @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