change - 用户数据源添加Id字段

master
Wen JY 2 years ago
parent 969ee3979b
commit 96b8498440

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

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

@ -5,23 +5,23 @@ import com.ruoyi.system.domain.SysUserDatasource;
/**
* Mapper
*
*
* @author wenjy
* @date 2023-07-03
*/
public interface SysUserDatasourceMapper
public interface SysUserDatasourceMapper
{
/**
*
*
* @param datasourceId
*
* @param id
* @return
*/
public SysUserDatasource selectSysUserDatasourceByDatasourceId(String datasourceId);
public SysUserDatasource selectSysUserDatasourceById(Long id);
/**
*
*
*
* @param sysUserDatasource
* @return
*/
@ -29,7 +29,7 @@ public interface SysUserDatasourceMapper
/**
*
*
*
* @param sysUserDatasource
* @return
*/
@ -37,7 +37,7 @@ public interface SysUserDatasourceMapper
/**
*
*
*
* @param sysUserDatasource
* @return
*/
@ -45,17 +45,17 @@ public interface SysUserDatasourceMapper
/**
*
*
* @param datasourceId
*
* @param id
* @return
*/
public int deleteSysUserDatasourceByDatasourceId(String datasourceId);
public int deleteSysUserDatasourceById(Long id);
/**
*
*
* @param datasourceIds
*
* @param ids
* @return
*/
public int deleteSysUserDatasourceByDatasourceIds(String[] datasourceIds);
public int deleteSysUserDatasourceByIds(Long[] ids);
}

@ -5,23 +5,23 @@ import com.ruoyi.system.domain.SysUserDatasource;
/**
* Service
*
*
* @author wenjy
* @date 2023-07-03
*/
public interface ISysUserDatasourceService
public interface ISysUserDatasourceService
{
/**
*
*
* @param datasourceId
*
* @param id
* @return
*/
public SysUserDatasource selectSysUserDatasourceByDatasourceId(String datasourceId);
public SysUserDatasource selectSysUserDatasourceById(Long id);
/**
*
*
*
* @param sysUserDatasource
* @return
*/
@ -29,7 +29,7 @@ public interface ISysUserDatasourceService
/**
*
*
*
* @param sysUserDatasource
* @return
*/
@ -37,7 +37,7 @@ public interface ISysUserDatasourceService
/**
*
*
*
* @param sysUserDatasource
* @return
*/
@ -45,17 +45,17 @@ public interface ISysUserDatasourceService
/**
*
*
* @param datasourceIds
*
* @param ids
* @return
*/
public int deleteSysUserDatasourceByDatasourceIds(String[] datasourceIds);
public int deleteSysUserDatasourceByIds(Long[] ids);
/**
*
*
* @param datasourceId
*
* @param id
* @return
*/
public int deleteSysUserDatasourceByDatasourceId(String datasourceId);
public int deleteSysUserDatasourceById(Long id);
}

@ -9,31 +9,31 @@ import com.ruoyi.system.service.ISysUserDatasourceService;
/**
* Service
*
*
* @author wenjy
* @date 2023-07-03
*/
@Service
public class SysUserDatasourceServiceImpl implements ISysUserDatasourceService
public class SysUserDatasourceServiceImpl implements ISysUserDatasourceService
{
@Autowired
private SysUserDatasourceMapper sysUserDatasourceMapper;
/**
*
*
* @param datasourceId
*
* @param id
* @return
*/
@Override
public SysUserDatasource selectSysUserDatasourceByDatasourceId(String datasourceId)
public SysUserDatasource selectSysUserDatasourceById(Long id)
{
return sysUserDatasourceMapper.selectSysUserDatasourceByDatasourceId(datasourceId);
return sysUserDatasourceMapper.selectSysUserDatasourceById(id);
}
/**
*
*
*
* @param sysUserDatasource
* @return
*/
@ -45,7 +45,7 @@ public class SysUserDatasourceServiceImpl implements ISysUserDatasourceService
/**
*
*
*
* @param sysUserDatasource
* @return
*/
@ -57,7 +57,7 @@ public class SysUserDatasourceServiceImpl implements ISysUserDatasourceService
/**
*
*
*
* @param sysUserDatasource
* @return
*/
@ -69,25 +69,25 @@ public class SysUserDatasourceServiceImpl implements ISysUserDatasourceService
/**
*
*
* @param datasourceIds
*
* @param ids
* @return
*/
@Override
public int deleteSysUserDatasourceByDatasourceIds(String[] datasourceIds)
public int deleteSysUserDatasourceByIds(Long[] ids)
{
return sysUserDatasourceMapper.deleteSysUserDatasourceByDatasourceIds(datasourceIds);
return sysUserDatasourceMapper.deleteSysUserDatasourceByIds(ids);
}
/**
*
*
* @param datasourceId
*
* @param id
* @return
*/
@Override
public int deleteSysUserDatasourceByDatasourceId(String datasourceId)
public int deleteSysUserDatasourceById(Long id)
{
return sysUserDatasourceMapper.deleteSysUserDatasourceByDatasourceId(datasourceId);
return sysUserDatasourceMapper.deleteSysUserDatasourceById(id);
}
}

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

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

@ -75,6 +75,7 @@
<el-table v-loading="loading" :data="userdatasourceList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<!-- <el-table-column label="${comment}" align="center" prop="id" />-->
<el-table-column align="center" label="数据ID" prop="datasourceId"/>
<el-table-column align="center" label="用户ID" prop="userId"/>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
@ -244,8 +245,8 @@ export default {
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.datasourceId)
this.single = selection.length !== 1
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
@ -257,8 +258,8 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const datasourceId = row.datasourceId || this.ids
getUserdatasource(datasourceId).then(response => {
const id = row.id || this.ids
getUserdatasource(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改用户数据";
@ -268,7 +269,7 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.datasourceId != null) {
if (this.form.id != null) {
updateUserdatasource(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
@ -286,14 +287,13 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const datasourceIds = row.datasourceId || this.ids;
this.$modal.confirm('是否确认删除用户数据编号为"' + datasourceIds + '"的数据项?').then(function () {
return delUserdatasource(datasourceIds);
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除用户数据编号为"' + ids + '"的数据项?').then(function() {
return delUserdatasource(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {

Loading…
Cancel
Save