From dff994a28ff9be38450bc4e7ba540c2831d1206f Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期五, 21 七月 2023 09:53:55 +0800 Subject: [PATCH] 上传车辆图片id设为非必要提交 --- ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java index 504badd..ef9d092 100644 --- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java +++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java @@ -1,7 +1,13 @@ package com.ruoyi.sy.controller; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.utils.uuid.IdUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -29,6 +35,7 @@ */ @RestController @RequestMapping("/sy/syUser") +@Api(tags = "涓変竴杞﹁締鐢ㄦ埛绠$悊鎺ュ彛") public class ArdSyUserController extends BaseController { @Autowired @@ -39,10 +46,13 @@ */ @PreAuthorize("@ss.hasPermi('sy:syUser:list')") @GetMapping("/list") + @ApiOperation("鏌ヨ涓変竴杞﹁締鎸傛帴鐢ㄦ埛") public TableDataInfo list(ArdSyUser ardSyUser) { startPage(); - List<ArdSyUser> list = ardSyUserService.selectArdSyUserList(ardSyUser); + /*List<ArdSyUser> list = ardSyUserService.selectArdSyUserList(ardSyUser); + return getDataTable(list);*/ + List<Map<String,Object>> list = ardSyUserService.selectArdSyUserListWithSysUser(ardSyUser); return getDataTable(list); } @@ -75,8 +85,11 @@ @PreAuthorize("@ss.hasPermi('sy:syUser:add')") @Log(title = "涓変竴杞﹁締鐢ㄦ埛", businessType = BusinessType.INSERT) @PostMapping + @ApiOperation("鏂板涓変竴鐢ㄦ埛") public AjaxResult add(@RequestBody ArdSyUser ardSyUser) { + String id = IdUtils.simpleUUID(); + ardSyUser.setId(id); return toAjax(ardSyUserService.insertArdSyUser(ardSyUser)); } @@ -101,4 +114,30 @@ { return toAjax(ardSyUserService.deleteArdSyUserByIds(ids)); } + + /** + * 鏌ヨ涓変竴杞﹁締鐢ㄦ埛鍒楄〃 + */ + /*@PreAuthorize("@ss.hasPermi('sy:syUser:getArdSyUserAll')") + @GetMapping("/getArdSyUserAll") + @ApiOperation("鏌ヨ鍏ㄩ儴涓変竴鐢ㄦ埛") + public AjaxResult getArdSyUserAll() + { + //startPage(); + List<ArdSyUser> list = ardSyUserService.getArdSyUserAll(); + return success(list); + }*/ + + /** + * 鏌ヨ鏈寕鎺ヤ笁涓�杞﹁締鐨�4.0鐢ㄦ埛 + */ + @PreAuthorize("@ss.hasPermi('sy:syUser:getSysUserNoSY')") + @GetMapping("/getSysUserNoSY") + @ApiOperation("鏌ヨ鏈寕鎺ヤ笁涓�杞﹁締鐨�4.0鐢ㄦ埛") + public AjaxResult getSysUserNoSY() + { + startPage(); + List<SysUser> list = ardSyUserService.getSysUserNoSY(); + return success(list); + } } -- Gitblit v1.9.3