zhangnaisong
2023-07-21 dff994a28ff9be38450bc4e7ba540c2831d1206f
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);
    }
}