diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserDatasourceController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserDatasourceController.java index 9ebcd4d..90c1b6a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserDatasourceController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserDatasourceController.java @@ -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)); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserDatasource.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserDatasource.java index d545952..a3bc029 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserDatasource.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserDatasource.java @@ -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(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserDatasourceMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserDatasourceMapper.java index 37e9034..d2cc477 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserDatasourceMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserDatasourceMapper.java @@ -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); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserDatasourceService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserDatasourceService.java index 09eedb0..a9ac689 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserDatasourceService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserDatasourceService.java @@ -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); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDatasourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDatasourceServiceImpl.java index 96a6f12..eaf89ea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDatasourceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDatasourceServiceImpl.java @@ -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); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserDatasourceMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserDatasourceMapper.xml index 6d490d5..2ecaa95 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserDatasourceMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserDatasourceMapper.xml @@ -1,59 +1,61 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + - select datasource_id, user_id from sys_user_datasource + select id, datasource_id, user_id from sys_user_datasource - - - where datasource_id = #{datasourceId} + where id = #{id} - - + + insert into sys_user_datasource datasource_id, user_id, - + #{datasourceId}, #{userId}, - + update sys_user_datasource + datasource_id = #{datasourceId}, user_id = #{userId}, - where datasource_id = #{datasourceId} + where id = #{id} - - delete from sys_user_datasource where datasource_id = #{datasourceId} + + delete from sys_user_datasource where id = #{id} - - delete from sys_user_datasource where datasource_id in - - #{datasourceId} + + delete from sys_user_datasource where id in + + #{id} \ No newline at end of file diff --git a/ruoyi-ui/src/api/system/userdatasource.js b/ruoyi-ui/src/api/system/userdatasource.js index cd5e590..c111fc1 100644 --- a/ruoyi-ui/src/api/system/userdatasource.js +++ b/ruoyi-ui/src/api/system/userdatasource.js @@ -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' - }) -}