From 699001a9fd31b4fc78e76bcff86ed324dd052c0c Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 12 十一月 2025 17:00:47 +0800
Subject: [PATCH] 修改了一个bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java | 131 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 128 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
index 9eaeff5..e946234 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.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.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.ZHonor;
+import com.ruoyi.service.ZHonorDownloadService;
+import com.ruoyi.service.ZHonorService;
+import com.ruoyi.service.ZHonorShareService;
+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 +37,110 @@
*/
@RestController
@RequestMapping("/zHonor")
-public class ZHonorController {
+@Slf4j
+public class ZHonorController extends BaseController {
+ @Autowired
+ private ZHonorService zHonorService;
+
+ @Autowired
+ private ZHonorDownloadService zHonorDownloadService;
+
+ @Autowired
+ private ZHonorShareService zHonorShareService;
+
+ /**
+ * 鏌ヨ鎵�鏈夎褰�
+ */
+ @GetMapping("/all")
+ public AjaxResult listAll(ZHonor zHonor){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zHonorService.selectDataList(zHonor,pageNum,pageSize);
+ }
+
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zHonorService.listType();
+ }
+
+ /**
+ * 鏍规嵁id鏌ヨ
+ */
+ @GetMapping()
+ public AjaxResult listById(Long id){
+ return AjaxResult.success(zHonorService.getById(id));
+ }
+
+ /**
+ * 妯℃澘
+ */
+ @PostMapping("/model")
+ public void getModel(HttpServletResponse response){
+ ZHonor zHonor = new ZHonor();
+ List<ZHonor> emptyList = Collections.singletonList(zHonor);
+ ExcelUtil<ZHonor> util = new ExcelUtil<>(ZHonor.class);
+ util.exportExcel(response, emptyList, "璇佷欢銆佽崳瑾夈�佽祫璐ㄨ褰曟暟鎹�");
+ }
+
+ /**
+ * 瀵煎嚭璇佷欢銆佽崳瑾夈�佽祫璐ㄨ褰曞垪琛�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "璇佷欢銆佽崳瑾夈�佽祫璐ㄨ褰�", businessType = BusinessType.EXPORT)
+ @PostMapping(value = {"/export/{ids}","/export"})
+ public void export(HttpServletResponse response,@PathVariable(required = false) Long[] ids)
+ {
+ List<ZHonor> list = zHonorService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZHonor> util = new ExcelUtil<>(ZHonor.class);
+ util.exportExcel(response, list, "璇佷欢銆佽崳瑾夈�佽祫璐ㄨ褰曟暟鎹�");
+ }
+
+ /**
+ * 瀵煎叆璇佷欢銆佽崳瑾夈�佽祫璐ㄨ褰曞垪琛�
+ */
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
+ {
+ return zHonorService.importExcel(file);
+ }
+
+ /**
+ * 鏂板璇佷欢銆佽崳瑾夈�佽祫璐ㄨ褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:add')")
+ @Log(title = "璇佷欢銆佽崳瑾夈�佽祫璐ㄨ褰�", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ZHonor zHonor)
+ {
+ return zHonorService.mySave(zHonor);
+ }
+
+ /**
+ * 淇敼璇佷欢銆佽崳瑾夈�佽祫璐ㄨ褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:edit')")
+ @Log(title = "璇佷欢銆佽崳瑾夈�佽祫璐ㄨ褰�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ZHonor zHonor)
+ {
+ return toAjax(zHonorService.updateById(zHonor));
+ }
+//
+ /**
+ * 鎵归噺鍒犻櫎璇佷欢銆佽崳瑾夈�佽祫璐ㄨ褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:remove')")
+ @Log(title = "璇佷欢銆佽崳瑾夈�佽祫璐ㄨ褰�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ if (! (zHonorDownloadService.deleteData(ids) && zHonorShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
+ return toAjax(zHonorService.removeByIds(Arrays.asList(ids)));
+ }
}
--
Gitblit v1.9.1