wenjy
/
highway-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	ruoyi-ui/src/views/system/userdatasource/index.vue
master
夜笙歌 2 years ago
parent 21ff3b2ea5 96b8498440
commit 75c600c556
7 changed files with 102 additions and 95 deletions
Show Stats Download Patch File Download Diff File

14
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserDatasourceController.java
Unescape Escape View File

@ -24,7 +24,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
/** /**
* 用户数据Controller * 用户数据Controller
* *
* @author wenjy * @author wenjy
* @date 2023-07-03 * @date 2023-07-03
*/ */
@ -64,10 +64,10 @@ public class SysUserDatasourceController extends BaseController
* 获取用户数据详细信息 * 获取用户数据详细信息
*/ */
@RequiresPermissions("system:userdatasource:query") @RequiresPermissions("system:userdatasource:query")
@GetMapping(value = "/{datasourceId}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("datasourceId") String datasourceId) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
return success(sysUserDatasourceService.selectSysUserDatasourceByDatasourceId(datasourceId)); return success(sysUserDatasourceService.selectSysUserDatasourceById(id));
} }
/** /**
@ -97,9 +97,9 @@ public class SysUserDatasourceController extends BaseController
*/ */
@RequiresPermissions("system:userdatasource:remove") @RequiresPermissions("system:userdatasource:remove")
@Log(title = "用户数据", businessType = BusinessType.DELETE) @Log(title = "用户数据", businessType = BusinessType.DELETE)
@DeleteMapping("/{datasourceIds}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] datasourceIds) public AjaxResult remove(@PathVariable Long[] ids)
{ {
return toAjax(sysUserDatasourceService.deleteSysUserDatasourceByDatasourceIds(datasourceIds)); return toAjax(sysUserDatasourceService.deleteSysUserDatasourceByIds(ids));
} }
} }

37
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserDatasource.java
Unescape Escape View File

@ -7,7 +7,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
/** /**
* 用户数据对象 sys_user_datasource * 用户数据对象 sys_user_datasource
* *
* @author wenjy * @author wenjy
* @date 2023-07-03 * @date 2023-07-03
*/ */
@ -15,29 +15,41 @@ public class SysUserDatasource extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 数据ID */ /** $column.columnComment */
@Excel(name = "数据ID") private Long id;
/** */
@Excel(name = "")
private String datasourceId; private String datasourceId;
/** 用户ID */ /** */
@Excel(name = "用户ID") @Excel(name = "")
private String userId; private String userId;
public void setDatasourceId(String datasourceId) public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setDatasourceId(String datasourceId)
{ {
this.datasourceId = datasourceId; this.datasourceId = datasourceId;
} }
public String getDatasourceId() public String getDatasourceId()
{ {
return datasourceId; return datasourceId;
} }
public void setUserId(String userId) public void setUserId(String userId)
{ {
this.userId = userId; this.userId = userId;
} }
public String getUserId() public String getUserId()
{ {
return userId; return userId;
} }
@ -45,8 +57,9 @@ public class SysUserDatasource extends BaseEntity
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("datasourceId", getDatasourceId()) .append("id", getId())
.append("userId", getUserId()) .append("datasourceId", getDatasourceId())
.toString(); .append("userId", getUserId())
.toString();
} }
} }

28
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserDatasourceMapper.java
Unescape Escape View File

@ -5,23 +5,23 @@ import com.ruoyi.system.domain.SysUserDatasource;
/** /**
* 用户数据Mapper接口 * 用户数据Mapper接口
* *
* @author wenjy * @author wenjy
* @date 2023-07-03 * @date 2023-07-03
*/ */
public interface SysUserDatasourceMapper public interface SysUserDatasourceMapper
{ {
/** /**
* 查询用户数据 * 查询用户数据
* *
* @param datasourceId 用户数据主键 * @param id 用户数据主键
* @return 用户数据 * @return 用户数据
*/ */
public SysUserDatasource selectSysUserDatasourceByDatasourceId(String datasourceId); public SysUserDatasource selectSysUserDatasourceById(Long id);
/** /**
* 查询用户数据列表 * 查询用户数据列表
* *
* @param sysUserDatasource 用户数据 * @param sysUserDatasource 用户数据
* @return 用户数据集合 * @return 用户数据集合
*/ */
@ -29,7 +29,7 @@ public interface SysUserDatasourceMapper
/** /**
* 新增用户数据 * 新增用户数据
* *
* @param sysUserDatasource 用户数据 * @param sysUserDatasource 用户数据
* @return 结果 * @return 结果
*/ */
@ -37,7 +37,7 @@ public interface SysUserDatasourceMapper
/** /**
* 修改用户数据 * 修改用户数据
* *
* @param sysUserDatasource 用户数据 * @param sysUserDatasource 用户数据
* @return 结果 * @return 结果
*/ */
@ -45,17 +45,17 @@ public interface SysUserDatasourceMapper
/** /**
* 删除用户数据 * 删除用户数据
* *
* @param datasourceId 用户数据主键 * @param id 用户数据主键
* @return 结果 * @return 结果
*/ */
public int deleteSysUserDatasourceByDatasourceId(String datasourceId); public int deleteSysUserDatasourceById(Long id);
/** /**
* 批量删除用户数据 * 批量删除用户数据
* *
* @param datasourceIds 需要删除的数据主键集合 * @param ids 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteSysUserDatasourceByDatasourceIds(String[] datasourceIds); public int deleteSysUserDatasourceByIds(Long[] ids);
} }

28
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserDatasourceService.java
Unescape Escape View File

@ -5,23 +5,23 @@ import com.ruoyi.system.domain.SysUserDatasource;
/** /**
* 用户数据Service接口 * 用户数据Service接口
* *
* @author wenjy * @author wenjy
* @date 2023-07-03 * @date 2023-07-03
*/ */
public interface ISysUserDatasourceService public interface ISysUserDatasourceService
{ {
/** /**
* 查询用户数据 * 查询用户数据
* *
* @param datasourceId 用户数据主键 * @param id 用户数据主键
* @return 用户数据 * @return 用户数据
*/ */
public SysUserDatasource selectSysUserDatasourceByDatasourceId(String datasourceId); public SysUserDatasource selectSysUserDatasourceById(Long id);
/** /**
* 查询用户数据列表 * 查询用户数据列表
* *
* @param sysUserDatasource 用户数据 * @param sysUserDatasource 用户数据
* @return 用户数据集合 * @return 用户数据集合
*/ */
@ -29,7 +29,7 @@ public interface ISysUserDatasourceService
/** /**
* 新增用户数据 * 新增用户数据
* *
* @param sysUserDatasource 用户数据 * @param sysUserDatasource 用户数据
* @return 结果 * @return 结果
*/ */
@ -37,7 +37,7 @@ public interface ISysUserDatasourceService
/** /**
* 修改用户数据 * 修改用户数据
* *
* @param sysUserDatasource 用户数据 * @param sysUserDatasource 用户数据
* @return 结果 * @return 结果
*/ */
@ -45,17 +45,17 @@ public interface ISysUserDatasourceService
/** /**
* 批量删除用户数据 * 批量删除用户数据
* *
* @param datasourceIds 需要删除的用户数据主键集合 * @param ids 需要删除的用户数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteSysUserDatasourceByDatasourceIds(String[] datasourceIds); public int deleteSysUserDatasourceByIds(Long[] ids);
/** /**
* 删除用户数据信息 * 删除用户数据信息
* *
* @param datasourceId 用户数据主键 * @param id 用户数据主键
* @return 结果 * @return 结果
*/ */
public int deleteSysUserDatasourceByDatasourceId(String datasourceId); public int deleteSysUserDatasourceById(Long id);
} }

34
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDatasourceServiceImpl.java
Unescape Escape View File

@ -9,31 +9,31 @@ import com.ruoyi.system.service.ISysUserDatasourceService;
/** /**
* 用户数据Service业务层处理 * 用户数据Service业务层处理
* *
* @author wenjy * @author wenjy
* @date 2023-07-03 * @date 2023-07-03
*/ */
@Service @Service
public class SysUserDatasourceServiceImpl implements ISysUserDatasourceService public class SysUserDatasourceServiceImpl implements ISysUserDatasourceService
{ {
@Autowired @Autowired
private SysUserDatasourceMapper sysUserDatasourceMapper; private SysUserDatasourceMapper sysUserDatasourceMapper;
/** /**
* 查询用户数据 * 查询用户数据
* *
* @param datasourceId 用户数据主键 * @param id 用户数据主键
* @return 用户数据 * @return 用户数据
*/ */
@Override @Override
public SysUserDatasource selectSysUserDatasourceByDatasourceId(String datasourceId) public SysUserDatasource selectSysUserDatasourceById(Long id)
{ {
return sysUserDatasourceMapper.selectSysUserDatasourceByDatasourceId(datasourceId); return sysUserDatasourceMapper.selectSysUserDatasourceById(id);
} }
/** /**
* 查询用户数据列表 * 查询用户数据列表
* *
* @param sysUserDatasource 用户数据 * @param sysUserDatasource 用户数据
* @return 用户数据 * @return 用户数据
*/ */
@ -45,7 +45,7 @@ public class SysUserDatasourceServiceImpl implements ISysUserDatasourceService
/** /**
* 新增用户数据 * 新增用户数据
* *
* @param sysUserDatasource 用户数据 * @param sysUserDatasource 用户数据
* @return 结果 * @return 结果
*/ */
@ -57,7 +57,7 @@ public class SysUserDatasourceServiceImpl implements ISysUserDatasourceService
/** /**
* 修改用户数据 * 修改用户数据
* *
* @param sysUserDatasource 用户数据 * @param sysUserDatasource 用户数据
* @return 结果 * @return 结果
*/ */
@ -69,25 +69,25 @@ public class SysUserDatasourceServiceImpl implements ISysUserDatasourceService
/** /**
* 批量删除用户数据 * 批量删除用户数据
* *
* @param datasourceIds 需要删除的用户数据主键 * @param ids 需要删除的用户数据主键
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteSysUserDatasourceByDatasourceIds(String[] datasourceIds) public int deleteSysUserDatasourceByIds(Long[] ids)
{ {
return sysUserDatasourceMapper.deleteSysUserDatasourceByDatasourceIds(datasourceIds); return sysUserDatasourceMapper.deleteSysUserDatasourceByIds(ids);
} }
/** /**
* 删除用户数据信息 * 删除用户数据信息
* *
* @param datasourceId 用户数据主键 * @param id 用户数据主键
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteSysUserDatasourceByDatasourceId(String datasourceId) public int deleteSysUserDatasourceById(Long id)
{ {
return sysUserDatasourceMapper.deleteSysUserDatasourceByDatasourceId(datasourceId); return sysUserDatasourceMapper.deleteSysUserDatasourceById(id);
} }
} }

40
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserDatasourceMapper.xml
Unescape Escape View File

@ -1,59 +1,61 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserDatasourceMapper"> <mapper namespace="com.ruoyi.system.mapper.SysUserDatasourceMapper">
<resultMap type="SysUserDatasource" id="SysUserDatasourceResult"> <resultMap type="SysUserDatasource" id="SysUserDatasourceResult">
<result property="id" column="id" />
<result property="datasourceId" column="datasource_id" /> <result property="datasourceId" column="datasource_id" />
<result property="userId" column="user_id" /> <result property="userId" column="user_id" />
</resultMap> </resultMap>
<sql id="selectSysUserDatasourceVo"> <sql id="selectSysUserDatasourceVo">
select datasource_id, user_id from sys_user_datasource select id, datasource_id, user_id from sys_user_datasource
</sql> </sql>
<select id="selectSysUserDatasourceList" parameterType="SysUserDatasource" resultMap="SysUserDatasourceResult"> <select id="selectSysUserDatasourceList" parameterType="SysUserDatasource" resultMap="SysUserDatasourceResult">
<include refid="selectSysUserDatasourceVo"/> <include refid="selectSysUserDatasourceVo"/>
<where> <where>
<if test="datasourceId != null and datasourceId != ''"> and datasource_id = #{datasourceId}</if> <if test="datasourceId != null and datasourceId != ''"> and datasource_id = #{datasourceId}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if> <if test="userId != null and userId != ''"> and user_id = #{userId}</if>
</where> </where>
</select> </select>
<select id="selectSysUserDatasourceByDatasourceId" parameterType="String" resultMap="SysUserDatasourceResult"> <select id="selectSysUserDatasourceById" parameterType="Long" resultMap="SysUserDatasourceResult">
<include refid="selectSysUserDatasourceVo"/> <include refid="selectSysUserDatasourceVo"/>
where datasource_id = #{datasourceId} where id = #{id}
</select> </select>
<insert id="insertSysUserDatasource" parameterType="SysUserDatasource"> <insert id="insertSysUserDatasource" parameterType="SysUserDatasource" useGeneratedKeys="true" keyProperty="id">
insert into sys_user_datasource insert into sys_user_datasource
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="datasourceId != null and datasourceId != ''">datasource_id,</if> <if test="datasourceId != null and datasourceId != ''">datasource_id,</if>
<if test="userId != null and userId != ''">user_id,</if> <if test="userId != null and userId != ''">user_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="datasourceId != null and datasourceId != ''">#{datasourceId},</if> <if test="datasourceId != null and datasourceId != ''">#{datasourceId},</if>
<if test="userId != null and userId != ''">#{userId},</if> <if test="userId != null and userId != ''">#{userId},</if>
</trim> </trim>
</insert> </insert>
<update id="updateSysUserDatasource" parameterType="SysUserDatasource"> <update id="updateSysUserDatasource" parameterType="SysUserDatasource">
update sys_user_datasource update sys_user_datasource
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="datasourceId != null and datasourceId != ''">datasource_id = #{datasourceId},</if>
<if test="userId != null and userId != ''">user_id = #{userId},</if> <if test="userId != null and userId != ''">user_id = #{userId},</if>
</trim> </trim>
where datasource_id = #{datasourceId} where id = #{id}
</update> </update>
<delete id="deleteSysUserDatasourceByDatasourceId" parameterType="String"> <delete id="deleteSysUserDatasourceById" parameterType="Long">
delete from sys_user_datasource where datasource_id = #{datasourceId} delete from sys_user_datasource where id = #{id}
</delete> </delete>
<delete id="deleteSysUserDatasourceByDatasourceIds" parameterType="String"> <delete id="deleteSysUserDatasourceByIds" parameterType="String">
delete from sys_user_datasource where datasource_id in delete from sys_user_datasource where id in
<foreach item="datasourceId" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{datasourceId} #{id}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

16
ruoyi-ui/src/api/system/userdatasource.js
Unescape Escape View File

@ -10,9 +10,9 @@ export function listUserdatasource(query) {
} }
// 查询用户数据详细 // 查询用户数据详细
export function getUserdatasource(datasourceId) { export function getUserdatasource(id) {
return request({ return request({
url: '/system/userdatasource/' + datasourceId, url: '/system/userdatasource/' + id,
method: 'get' method: 'get'
}) })
} }
@ -36,17 +36,9 @@ export function updateUserdatasource(data) {
} }
// 删除用户数据 // 删除用户数据
export function delUserdatasource(datasourceId) { export function delUserdatasource(id) {
return request({ return request({
url: '/system/userdatasource/' + datasourceId, url: '/system/userdatasource/' + id,
method: 'delete' method: 'delete'
}) })
} }
// 删除用户数据
export function getDatasourceIdList() {
return request({
url: '/system/datasource/list' ,
method: 'get'
})
}

Write Preview
Loading…
Cancel
Save