From b4754ea670156f7f799311a9fdc9b3d380982fcb Mon Sep 17 00:00:00 2001 From: Jinquan_Ou <Jinquan@gdut.com> Date: 星期四, 06 四月 2023 18:23:00 +0800 Subject: [PATCH] 555 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 101 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java index f148094..c028530 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java @@ -1,9 +1,26 @@ 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.ZfEquipment; +import com.ruoyi.service.ZfEquipmentService; +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.List; + +import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM; +import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE; /** * <p> @@ -15,7 +32,88 @@ */ @RestController @RequestMapping("/zfEquipment") -public class ZfEquipmentController { +@Slf4j +public class ZfEquipmentController extends BaseController { + + @Autowired + private ZfEquipmentService zfEquipmentService; + + @GetMapping("/all") + public AjaxResult listAll(ZfEquipment zfEquipment){ + + Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return zfEquipmentService.selectEquipmentList(zfEquipment, pageNum, pageSize); + } + + + /** + * 瀵煎嚭瀹跺涵璁惧璁板綍鍒楄〃 + */ +// @PreAuthorize("@ss.hasPermi('system:equipment:export')") + @Log(title = "瀹跺涵璁惧璁板綍", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ZfEquipment zfEquipment) + { + List<ZfEquipment> list = zfEquipmentService.selectByCondition(zfEquipment); + log.info("瀵煎嚭璁板綍涓�:{}",list); + ExcelUtil<ZfEquipment> util = new ExcelUtil<ZfEquipment>(ZfEquipment.class); + util.exportExcel(response, list, "瀹跺涵璁惧璁板綍鏁版嵁"); + } +// + + /** + * 瀵煎叆瀹跺涵璁惧璁板綍鍒楄〃 + */ + @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.IMPORT) + @PostMapping("/importData") + public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception + { + return zfEquipmentService.importExcel(file); + } + + /** + * 鑾峰彇瀹跺涵璁惧璁板綍璇︾粏淇℃伅 + */ +// @PreAuthorize("@ss.hasPermi('system:equipment:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(zfEquipmentService.getById(id)); + } +// + /** + * 鏂板瀹跺涵璁惧璁板綍 + */ +// @PreAuthorize("@ss.hasPermi('system:equipment:add')") + @Log(title = "瀹跺涵璁惧璁板綍", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ZfEquipment zfEquipment) + { + return toAjax(zfEquipmentService.addEquipment(zfEquipment)); + } + + /** + * 淇敼瀹跺涵璁惧璁板綍 + */ +// @PreAuthorize("@ss.hasPermi('system:equipment:edit')") + @Log(title = "瀹跺涵璁惧璁板綍", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ZfEquipment zfEquipment) + { + return toAjax(zfEquipmentService.updateById(zfEquipment)); + } +// + /** + * 鎵归噺鍒犻櫎瀹跺涵璁惧璁板綍 + */ +// @PreAuthorize("@ss.hasPermi('system:equipment:remove')") + @Log(title = "瀹跺涵璁惧璁板綍", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(zfEquipmentService.removeByIds(Arrays.asList(ids))); + } } -- Gitblit v1.9.1