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

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserDatasourceController.java

@@ -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));
     }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserDatasource.java

@@ -15,14 +15,26 @@ 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 setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
     public void setDatasourceId(String datasourceId)
     {
         this.datasourceId = datasourceId;
@@ -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();
     }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserDatasourceMapper.java

@@ -14,10 +14,10 @@ public interface SysUserDatasourceMapper
     /**
      * 查询用户数据
      *
-     * @param datasourceId 用户数据主键
+     * @param id 用户数据主键
      * @return 用户数据
      */
-    public SysUserDatasource selectSysUserDatasourceByDatasourceId(String datasourceId);
+    public SysUserDatasource selectSysUserDatasourceById(Long id);
 
     /**
      * 查询用户数据列表
@@ -46,16 +46,16 @@ 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);
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserDatasourceService.java

@@ -14,10 +14,10 @@ public interface ISysUserDatasourceService
     /**
      * 查询用户数据
      *
-     * @param datasourceId 用户数据主键
+     * @param id 用户数据主键
      * @return 用户数据
      */
-    public SysUserDatasource selectSysUserDatasourceByDatasourceId(String datasourceId);
+    public SysUserDatasource selectSysUserDatasourceById(Long id);
 
     /**
      * 查询用户数据列表
@@ -46,16 +46,16 @@ 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);
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDatasourceServiceImpl.java

@@ -22,13 +22,13 @@ public class SysUserDatasourceServiceImpl implements ISysUserDatasourceService
     /**
      * 查询用户数据
      *
-     * @param datasourceId 用户数据主键
+     * @param id 用户数据主键
      * @return 用户数据
      */
     @Override
-    public SysUserDatasource selectSysUserDatasourceByDatasourceId(String datasourceId)
+    public SysUserDatasource selectSysUserDatasourceById(Long id)
     {
-        return sysUserDatasourceMapper.selectSysUserDatasourceByDatasourceId(datasourceId);
+        return sysUserDatasourceMapper.selectSysUserDatasourceById(id);
     }
 
     /**
@@ -70,24 +70,24 @@ 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);
     }
 }

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserDatasourceMapper.xml

@@ -1,16 +1,17 @@
 <?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">
@@ -21,39 +22,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </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>

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'
-  })
-}

ruoyi-ui/src/views/system/userdatasource/index.vue

@@ -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() {