三一用户查询新增系统用户提交

zhangnaisong

2023-06-25 8c15564b476b9abbfb1ca7fbf6b843e8af64accb

三一用户查询新增系统用户提交

 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java

@@ -1,6 +1,7 @@
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;
@@ -45,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);
    }


 ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java

@@ -1,6 +1,8 @@
package com.ruoyi.sy.mapper;

import java.util.List;
import java.util.Map;

import com.ruoyi.sy.domain.ArdSyUser;

/**
@@ -27,6 +29,9 @@
     */
    public List<ArdSyUser> selectArdSyUserList(ArdSyUser ardSyUser);


    public List<Map<String,Object>> selectArdSyUserListWithSysUser(ArdSyUser ardSyUser);

    /**
     * 新增三一车辆用户
     * 

 ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java

@@ -1,6 +1,8 @@
package com.ruoyi.sy.service;

import java.util.List;
import java.util.Map;

import com.ruoyi.sy.domain.ArdSyUser;

/**
@@ -26,6 +28,7 @@
     * @return 三一车辆用户集合
     */
    public List<ArdSyUser> selectArdSyUserList(ArdSyUser ardSyUser);
    public List<Map<String,Object>> selectArdSyUserListWithSysUser(ArdSyUser ardSyUser);

    /**
     * 新增三一车辆用户

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java

@@ -1,6 +1,7 @@
package com.ruoyi.sy.service.impl;

import java.util.List;
import java.util.Map;

import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +45,12 @@
        return ardSyUserMapper.selectArdSyUserList(ardSyUser);
    }


    @Override
    public List<Map<String,Object>> selectArdSyUserListWithSysUser(ArdSyUser ardSyUser) {
        return ardSyUserMapper.selectArdSyUserListWithSysUser(ardSyUser);
    }

    /**
     * 新增三一车辆用户
     *

 ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml

@@ -27,6 +27,23 @@
            <if test="reserved2 != null  and reserved2 != ''"> and reserved_2 = #{reserved2}</if>
        </where>
    </select>

    <select id="selectArdSyUserListWithSysUser" parameterType="ArdSyUser" resultType="java.util.Map">
        select su.user_name as "userName",coalesce(asu.id,'') as id,
        coalesce(asu.sys_user_id,'') as "sysUserId",
        coalesce(asu.user_id,'') as "userId",
        coalesce(asu.password,'') as password,
        coalesce(asu.reserved_1,'') as reserved1,
        coalesce(asu.reserved_2,'') as reserved2 from ard_sy_user asu
        right join sys_user su on asu.sys_user_id = su.user_id
        <where>
            <if test="sysUserId != null  and sysUserId != ''"> and sys_user_id = #{sysUserId}</if>
            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
            <if test="password != null  and password != ''"> and password = #{password}</if>
            <if test="reserved1 != null  and reserved1 != ''"> and reserved_1 = #{reserved1}</if>
            <if test="reserved2 != null  and reserved2 != ''"> and reserved_2 = #{reserved2}</if>
        </where>
    </select>
    
    <select id="selectArdSyUserById" parameterType="String" resultMap="ArdSyUserResult">
        <include refid="selectArdSyUserVo"/>