From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期五, 08 九月 2023 11:16:35 +0800 Subject: [PATCH] 优化 --- ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java | 35 ++++++++++++----------------------- 1 files changed, 12 insertions(+), 23 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java index 68b6cee..2b78a38 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java @@ -1,31 +1,16 @@ package com.ycl.controller.epuipment; -import com.alibaba.excel.EasyExcel; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.ycl.annotation.LogSave; import com.ycl.api.CommonResult; import com.ycl.controller.BaseController; -import com.ycl.entity.dict.DataDictionary; -import com.ycl.entity.equipment.EquipmentBayonet; import com.ycl.entity.equipment.Loudspeaker; -import com.ycl.service.dict.IDataDictionaryService; -import com.ycl.service.equipment.IEquipmentBayonetService; import com.ycl.service.equipment.ILoudspeakerService; -import com.ycl.vo.equipment.EquipmentBayonetVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.SneakyThrows; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.stream.Collectors; /** @@ -50,31 +35,35 @@ @GetMapping("/query") @ApiOperation("鏌ヨ") @LogSave - public CommonResult search(@RequestParam(required = false) Integer size, - @RequestParam(required = false) Integer current, - @RequestParam(required = false) Short state) { - return null; + public CommonResult<IPage<Loudspeaker>> search(@RequestParam(required = true) Integer currentPage, + @RequestParam(required = true) Integer pageSize, + @RequestParam(required = false) Short state) { + return CommonResult.success(loudspeakerService.search(pageSize, currentPage, state)); } @PostMapping("/add") @ApiOperation("娣诲姞") @LogSave(operationType = "闊虫煴绠$悊", contain = "娣诲姞闊虫煴") public CommonResult add(@RequestBody Loudspeaker loudspeaker) { - return CommonResult.success(null); + loudspeaker.setState(Short.valueOf("1")); + loudspeakerService.save(loudspeaker); + return CommonResult.success(true); } @PutMapping("/update") @ApiOperation("缂栬緫") @LogSave(operationType = "闊虫煴绠$悊", contain = "淇敼闊虫煴") public CommonResult update(@RequestBody Loudspeaker loudspeaker) { - return CommonResult.success(null); + loudspeakerService.updateById(loudspeaker); + return CommonResult.success(true); } @DeleteMapping("/delete/{id}") @ApiOperation("鍒犻櫎") @LogSave(operationType = "闊虫煴绠$悊", contain = "鍒犻櫎闊虫煴") public CommonResult delete(@PathVariable Long id) { - return CommonResult.success(null); + loudspeakerService.removeById(id); + return CommonResult.success(true); } -- Gitblit v1.8.0