From cd538c205628f28839323b49b7f77f33196a601f Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期四, 11 七月 2024 15:50:42 +0800 Subject: [PATCH] 电磁锁操控加入判断速度为0提交 --- ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java index a5912b2..4ed9f95 100644 --- a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java +++ b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java @@ -3,10 +3,13 @@ import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletResponse; + +import com.github.xiaoymin.knife4j.annotations.DynamicParameter; import com.ruoyi.management3d.tiles3d.domain.ArdTiles3d; import com.ruoyi.management3d.tiles3d.service.IArdTiles3dService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -26,15 +29,14 @@ /** * 涓夌淮瀹炴櫙Controller - * + * * @author ard * @date 2023-06-16 */ @RestController @RequestMapping("/management3d/tiles3d") @Api(tags = "涓夌淮瀹炴櫙鎺ュ彛") -public class ArdTiles3dController extends BaseController -{ +public class ArdTiles3dController extends BaseController { @Autowired private IArdTiles3dService ardTiles3dService; @@ -43,8 +45,8 @@ */ @PreAuthorize("@ss.hasPermi('management3d:tiles3d:list')") @GetMapping("/list") - public TableDataInfo list(ArdTiles3d ardTiles3d) - { + @ApiOperation("鏌ヨ涓夌淮瀹炴櫙鍒楄〃") + public TableDataInfo list(ArdTiles3d ardTiles3d) { startPage(); List<ArdTiles3d> list = ardTiles3dService.selectArdTiles3dList(ardTiles3d); return getDataTable(list); @@ -56,8 +58,7 @@ @PreAuthorize("@ss.hasPermi('management3d:tiles3d:export')") @Log(title = "涓夌淮瀹炴櫙", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, ArdTiles3d ardTiles3d) - { + public void export(HttpServletResponse response, ArdTiles3d ardTiles3d) { List<ArdTiles3d> list = ardTiles3dService.selectArdTiles3dList(ardTiles3d); ExcelUtil<ArdTiles3d> util = new ExcelUtil<ArdTiles3d>(ArdTiles3d.class); util.exportExcel(response, list, "涓夌淮瀹炴櫙鏁版嵁"); @@ -68,48 +69,55 @@ */ @PreAuthorize("@ss.hasPermi('management3d:tiles3d:query')") @GetMapping(value = "/{tilesId}") - public AjaxResult getInfo(@PathVariable("tilesId") String tilesId) - { + @ApiOperation("鑾峰彇涓夌淮瀹炴櫙璇︾粏淇℃伅") + public AjaxResult getInfo(@PathVariable("tilesId") String tilesId) { return success(ardTiles3dService.selectArdTiles3dByTilesId(tilesId)); } /** * 鏂板涓夌淮瀹炴櫙 */ + @ApiOperation("鏂板涓夌淮瀹炴櫙") @PreAuthorize("@ss.hasPermi('management3d:tiles3d:add')") @Log(title = "涓夌淮瀹炴櫙", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody ArdTiles3d ardTiles3d) - { + public AjaxResult add(@RequestBody ArdTiles3d ardTiles3d) { return toAjax(ardTiles3dService.insertArdTiles3d(ardTiles3d)); } /** * 淇敼涓夌淮瀹炴櫙 */ + @ApiOperation("淇敼涓夌淮瀹炴櫙") @PreAuthorize("@ss.hasPermi('management3d:tiles3d:edit')") @Log(title = "涓夌淮瀹炴櫙", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody ArdTiles3d ardTiles3d) - { + public AjaxResult edit(@RequestBody ArdTiles3d ardTiles3d) { return toAjax(ardTiles3dService.updateArdTiles3d(ardTiles3d)); } /** * 鍒犻櫎涓夌淮瀹炴櫙 */ + @ApiOperation("鍒犻櫎涓夌淮瀹炴櫙") @PreAuthorize("@ss.hasPermi('management3d:tiles3d:remove')") @Log(title = "涓夌淮瀹炴櫙", businessType = BusinessType.DELETE) - @DeleteMapping("/{tilesIds}") - public AjaxResult remove(@PathVariable String[] tilesIds) - { + @DeleteMapping("/{tilesIds}") + public AjaxResult remove(@PathVariable String[] tilesIds) { return toAjax(ardTiles3dService.deleteArdTiles3dByTilesIds(tilesIds)); } + @GetMapping("/getDeptAndTiles3d") @ApiOperation("鑾峰彇閮ㄩ棬鍜屼笁缁村疄鏅�") - public AjaxResult getDeptAndTiles3d() - { + public AjaxResult getDeptAndTiles3d() { Map deptAndTiles3d = ardTiles3dService.getChildDeptAndTiles3d(); return AjaxResult.success(deptAndTiles3d); } + + @GetMapping("/getChildTiles3d") + @ApiOperation("鑾峰彇涓夌淮瀹炴櫙") + public AjaxResult getChildTiles3d() { + Map deptAndTiles3d = ardTiles3dService.getChildTiles3d(); + return AjaxResult.success(deptAndTiles3d); + } } -- Gitblit v1.9.3