From cedaeeed6d401aefebf93ea6ea21cc9e06d5f5db Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:36:48 +0800
Subject: [PATCH] 新增搜索 模块+同伴+时间
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java | 64 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
index 82753e6..9a82850 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
@@ -9,6 +9,8 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfEvent;
+import com.ruoyi.domain.excel.ZfEquipmentExcelBean;
+import com.ruoyi.domain.excel.ZfEventExcelBean;
import com.ruoyi.service.ZfEventService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -16,7 +18,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -39,10 +43,20 @@
private ZfEventService zfEventService;
@GetMapping("/all")
- public AjaxResult listAll(ZfEvent zfEvent){
+ public AjaxResult listAll(ZfEvent zfEvent) {
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return zfEventService.selectDataList(zfEvent, pageNum, pageSize);
+ }
+
+ /**
+ * 鑾峰彇瀵煎叆妯℃澘
+ */
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ZfEventExcelBean> list = Collections.singletonList(new ZfEventExcelBean());
+ ExcelUtil<ZfEventExcelBean> util = new ExcelUtil<>(ZfEventExcelBean.class);
+ util.exportExcel(response,list,"瀹跺ぇ浜嬭瀵煎叆妯℃澘");
}
@@ -52,23 +66,37 @@
// @PreAuthorize("@ss.hasPermi('system:property:export')")
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ZfEvent zfEvent)
- {
- List<ZfEvent> list = zfEventService.selectByCondition(zfEvent);
- log.info("瀵煎嚭璁板綍涓�:{}",list);
+ public void export(HttpServletResponse response, ZfEvent zfEvent) {
+ List<ZfEvent> list = new ArrayList<>();
+
+ list = zfEventService.selectByCondition(zfEvent);
+ log.info("瀵煎嚭璁板綍涓�:{}", list);
ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+
}
+ /**
+ * 瀵煎嚭瀹跺涵澶т簨浠惰褰曞垪琛�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export(HttpServletResponse response, @PathVariable Long[] ids) {
+ List<ZfEvent> list = zfEventService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}", list);
+ ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
+ util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+
+ }
+
/**
* 瀵煎叆瀹跺涵澶т簨浠惰褰曞垪琛�
*/
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
- public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
- {
+ public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception {
return zfEventService.importExcel(file);
-
}
/**
@@ -76,20 +104,19 @@
*/
// @PreAuthorize("@ss.hasPermi('system:property:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(zfEventService.getById(id));
}
//
+
/**
* 鏂板瀹跺涵澶т簨浠惰褰�
*/
// @PreAuthorize("@ss.hasPermi('system:property:add')")
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody ZfEvent zfEvent)
- {
- return zfEventService.addData2(zfEvent);
+ public AjaxResult add(@RequestBody ZfEvent zfEvent) {
+ return zfEventService.addData(zfEvent);
}
/**
@@ -98,20 +125,19 @@
// @PreAuthorize("@ss.hasPermi('system:property:edit')")
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody ZfEvent zfEvent)
- {
- return toAjax(zfEventService.updateById(zfEvent));
+ public AjaxResult edit(@RequestBody ZfEvent zfEvent) {
+ return zfEventService.updateData(zfEvent);
}
//
+
/**
* 鎵归噺鍒犻櫎瀹跺涵澶т簨浠惰褰�
*/
// @PreAuthorize("@ss.hasPermi('system:property:remove')")
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(zfEventService.removeByIds(Arrays.asList(ids)));
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return zfEventService.deleteData(ids);
}
}
--
Gitblit v1.9.1