zhangnaisong
2023-06-26 3af79ca14c6790617d0a1f48aabadb97a341f17f
查询未挂接三一的用户提交
已修改5个文件
56 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java
@@ -131,13 +131,13 @@
    /**
     * 查询未挂接三一车辆的4.0用户
     */
    /*@PreAuthorize("@ss.hasPermi('sy:syUser:getSysUserNoSY')")
    @PreAuthorize("@ss.hasPermi('sy:syUser:getSysUserNoSY')")
    @GetMapping("/getSysUserNoSY")
    @ApiOperation("查询未挂接三一车辆的4.0用户")
    public AjaxResult getSysUserNoSY()
    {
        //startPage();
        startPage();
        List<SysUser> list = ardSyUserService.getSysUserNoSY();
        return success(list);
    }*/
    }
}
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.sy.domain.ArdSyUser;
/**
@@ -69,4 +70,9 @@
     *
     */
    public List<ArdSyUser> getArdSyUserAll();
    /**
     * 查询未挂接三一车辆的4.0用户
     */
    public List<SysUser> getSysUserNoSY();
}
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.sy.domain.ArdSyUser;
/**
@@ -67,4 +68,9 @@
     *
     */
    public List<ArdSyUser> getArdSyUserAll();
    /**
     * 查询未挂接三一车辆的4.0用户
     */
    public List<SysUser> getSysUserNoSY();
}
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -105,4 +106,13 @@
        List<ArdSyUser> result = ardSyUserMapper.getArdSyUserAll();
        return result;
    }
    /**
     * 查询未挂接三一车辆的4.0用户
     */
    @Override
    public List<SysUser> getSysUserNoSY() {
        List<SysUser> result = ardSyUserMapper.getSysUserNoSY();
        return result;
    }
}
ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
@@ -13,6 +13,28 @@
        <result property="reserved2"    column="reserved_2"    />
    </resultMap>
    <resultMap type="SysUser" id="SysUserResult">
        <id property="userId" column="user_id"/>
        <result property="deptId" column="dept_id"/>
        <result property="userName" column="user_name"/>
        <result property="nickName" column="nick_name"/>
        <result property="email" column="email"/>
        <result property="phonenumber" column="phonenumber"/>
        <result property="sex" column="sex"/>
        <result property="avatar" column="avatar"/>
        <result property="password" column="password"/>
        <result property="status" column="status"/>
        <result property="delFlag" column="del_flag"/>
        <result property="loginIp" column="login_ip"/>
        <result property="loginDate" column="login_date"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="cameraPriority" column="camera_priority"/>
        <result property="remark" column="remark"/>
    </resultMap>
    <sql id="selectArdSyUserVo">
        select id, sys_user_id, user_id, password, reserved_1, reserved_2 from ard_sy_user
    </sql>
@@ -42,6 +64,7 @@
            <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>
            and su.del_flag = '0'
        </where>
    </select>
    
@@ -96,4 +119,9 @@
    <select id="getArdSyUserAll" resultMap="ArdSyUserResult">
       select * from ard_sy_user
    </select>
    <select id="getSysUserNoSY" resultMap="SysUserResult">
        select * from sys_user su where su.del_flag = '0'
        and su.user_id not in (select asu.sys_user_id from ard_sy_user asu)
    </select>
</mapper>