关联表添加id

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcCsFw.java

@@ -9,22 +9,36 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 场所房屋关联对象 szxc_cs_fw
  *
  * @author hs
- * @date 2024-03-29
+ * @date 2024-03-30
  */
 public class SzxcCsFw extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** id */
+    private Long id;
+
     /** 场所id */
+    @Excel(name = "场所id")
     private Long csId;
 
     /** 房屋id */
+    @Excel(name = "房屋id")
     private Long fwId;
 
     /** 房屋名称 */
     @Excel(name = "房屋名称")
     private String fwName;
 
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
     public void setCsId(Long csId)
     {
         this.csId = csId;
@@ -56,6 +70,7 @@ public class SzxcCsFw extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
                 .append("csId", getCsId())
                 .append("fwId", getFwId())
                 .append("fwName", getFwName())

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmCar.java

@@ -1,40 +1,55 @@
 package com.ruoyi.szxc.domain;
 
-import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 居民车辆关联对象 szxc_jm_car
- * 
+ *
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-30
  */
 public class SzxcJmCar extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** id */
+    private Long id;
+
     /** 居民id */
+    @Excel(name = "居民id")
     private Long jmId;
 
     /** 车辆id */
+    @Excel(name = "车辆id")
     private Long carId;
 
-    public void setJmId(Long jmId) 
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setJmId(Long jmId)
     {
         this.jmId = jmId;
     }
 
-    public Long getJmId() 
+    public Long getJmId()
     {
         return jmId;
     }
-    public void setCarId(Long carId) 
+    public void setCarId(Long carId)
     {
         this.carId = carId;
     }
 
-    public Long getCarId() 
+    public Long getCarId()
     {
         return carId;
     }
@@ -42,8 +57,9 @@ public class SzxcJmCar extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("jmId", getJmId())
+                .append("id", getId())
-            .append("carId", getCarId())
+                .append("jmId", getJmId())
-            .toString();
+                .append("carId", getCarId())
+                .toString();
     }
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmHouse.java

@@ -7,35 +7,49 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 居民房屋关联对象 szxc_jm_house
- * 
+ *
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-30
  */
 public class SzxcJmHouse extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** id */
+    private Long id;
+
     /** 居民id */
+    @Excel(name = "居民id")
     private Long jmId;
 
     /** 房屋id */
+    @Excel(name = "房屋id")
     private Long houseId;
 
-    public void setJmId(Long jmId) 
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setJmId(Long jmId)
     {
         this.jmId = jmId;
     }
 
-    public Long getJmId() 
+    public Long getJmId()
     {
         return jmId;
     }
-    public void setHouseId(Long houseId) 
+    public void setHouseId(Long houseId)
     {
         this.houseId = houseId;
     }
 
-    public Long getHouseId() 
+    public Long getHouseId()
     {
         return houseId;
     }
@@ -43,8 +57,9 @@ public class SzxcJmHouse extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("jmId", getJmId())
+                .append("id", getId())
-            .append("houseId", getHouseId())
+                .append("jmId", getJmId())
-            .toString();
+                .append("houseId", getHouseId())
+                .toString();
     }
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmTag.java

@@ -9,22 +9,36 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 居民标签关联对象 szxc_jm_tag
  *
  * @author hs
- * @date 2024-03-21
+ * @date 2024-03-30
  */
 public class SzxcJmTag extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** id */
+    private Long id;
+
     /** 居民id */
+    @Excel(name = "居民id")
     private Long jmId;
 
     /** 标签id */
+    @Excel(name = "标签id")
     private Long tagId;
 
     /** 标签名称 */
     @Excel(name = "标签名称")
     private String tagName;
 
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
     public void setJmId(Long jmId)
     {
         this.jmId = jmId;
@@ -56,6 +70,7 @@ public class SzxcJmTag extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
                 .append("jmId", getJmId())
                 .append("tagId", getTagId())
                 .append("tagName", getTagName())

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcCsFwMapper.xml

@@ -5,28 +5,31 @@
 <mapper namespace="com.ruoyi.szxc.mapper.SzxcCsFwMapper">
 
     <resultMap type="SzxcCsFw" id="SzxcCsFwResult">
+        <result property="id"    column="id"    />
         <result property="csId"    column="cs_id"    />
         <result property="fwId"    column="fw_id"    />
         <result property="fwName"    column="fw_name"    />
     </resultMap>
 
     <sql id="selectSzxcCsFwVo">
-        select cs_id, fw_id, fw_name from szxc_cs_fw
+        select id, cs_id, fw_id, fw_name from szxc_cs_fw
     </sql>
 
     <select id="selectSzxcCsFwList" parameterType="SzxcCsFw" resultMap="SzxcCsFwResult">
         <include refid="selectSzxcCsFwVo"/>
         <where>
+            <if test="csId != null "> and cs_id = #{csId}</if>
+            <if test="fwId != null "> and fw_id = #{fwId}</if>
             <if test="fwName != null  and fwName != ''"> and fw_name like concat('%', #{fwName}, '%')</if>
         </where>
     </select>
 
-    <select id="selectSzxcCsFwByCsId" parameterType="Long" resultMap="SzxcCsFwResult">
+    <select id="selectSzxcCsFwById" parameterType="Long" resultMap="SzxcCsFwResult">
         <include refid="selectSzxcCsFwVo"/>
-        where cs_id = #{csId}
+        where id = #{id}
     </select>
 
-    <insert id="insertSzxcCsFw" parameterType="SzxcCsFw">
+    <insert id="insertSzxcCsFw" parameterType="SzxcCsFw" useGeneratedKeys="true" keyProperty="id">
         insert into szxc_cs_fw
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="csId != null">cs_id,</if>
@@ -43,20 +46,21 @@
     <update id="updateSzxcCsFw" parameterType="SzxcCsFw">
         update szxc_cs_fw
         <trim prefix="SET" suffixOverrides=",">
+            <if test="csId != null">cs_id = #{csId},</if>
             <if test="fwId != null">fw_id = #{fwId},</if>
             <if test="fwName != null and fwName != ''">fw_name = #{fwName},</if>
         </trim>
-        where cs_id = #{csId}
+        where id = #{id}
     </update>
 
-    <delete id="deleteSzxcCsFwByCsId" parameterType="Long">
+    <delete id="deleteSzxcCsFwById" parameterType="Long">
-        delete from szxc_cs_fw where cs_id = #{csId}
+        delete from szxc_cs_fw where id = #{id}
     </delete>
 
-    <delete id="deleteSzxcCsFwByCsIds" parameterType="String">
+    <delete id="deleteSzxcCsFwByIds" parameterType="String">
-        delete from szxc_cs_fw where cs_id in
+        delete from szxc_cs_fw where id in
-        <foreach item="csId" collection="array" open="(" separator="," close=")">
+        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{csId}
+            #{id}
         </foreach>
     </delete>
 </mapper>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmCarMapper.xml

@@ -0,0 +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">
+<mapper namespace="com.ruoyi.szxc.mapper.SzxcJmCarMapper">
+
+    <resultMap type="SzxcJmCar" id="SzxcJmCarResult">
+        <result property="id"    column="id"    />
+        <result property="jmId"    column="jm_id"    />
+        <result property="carId"    column="car_id"    />
+    </resultMap>
+
+    <sql id="selectSzxcJmCarVo">
+        select id, jm_id, car_id from szxc_jm_car
+    </sql>
+
+    <select id="selectSzxcJmCarList" parameterType="SzxcJmCar" resultMap="SzxcJmCarResult">
+        <include refid="selectSzxcJmCarVo"/>
+        <where>
+            <if test="jmId != null "> and jm_id = #{jmId}</if>
+            <if test="carId != null "> and car_id = #{carId}</if>
+        </where>
+    </select>
+
+    <select id="selectSzxcJmCarById" parameterType="Long" resultMap="SzxcJmCarResult">
+        <include refid="selectSzxcJmCarVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSzxcJmCar" parameterType="SzxcJmCar" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_jm_car
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jmId != null">jm_id,</if>
+            <if test="carId != null">car_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jmId != null">#{jmId},</if>
+            <if test="carId != null">#{carId},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSzxcJmCar" parameterType="SzxcJmCar">
+        update szxc_jm_car
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jmId != null">jm_id = #{jmId},</if>
+            <if test="carId != null">car_id = #{carId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSzxcJmCarById" parameterType="Long">
+        delete from szxc_jm_car where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcJmCarByIds" parameterType="String">
+        delete from szxc_jm_car where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmHouseMapper.xml

@@ -0,0 +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">
+<mapper namespace="com.ruoyi.szxc.mapper.SzxcJmHouseMapper">
+
+    <resultMap type="SzxcJmHouse" id="SzxcJmHouseResult">
+        <result property="id"    column="id"    />
+        <result property="jmId"    column="jm_id"    />
+        <result property="houseId"    column="house_id"    />
+    </resultMap>
+
+    <sql id="selectSzxcJmHouseVo">
+        select id, jm_id, house_id from szxc_jm_house
+    </sql>
+
+    <select id="selectSzxcJmHouseList" parameterType="SzxcJmHouse" resultMap="SzxcJmHouseResult">
+        <include refid="selectSzxcJmHouseVo"/>
+        <where>
+            <if test="jmId != null "> and jm_id = #{jmId}</if>
+            <if test="houseId != null "> and house_id = #{houseId}</if>
+        </where>
+    </select>
+
+    <select id="selectSzxcJmHouseById" parameterType="Long" resultMap="SzxcJmHouseResult">
+        <include refid="selectSzxcJmHouseVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSzxcJmHouse" parameterType="SzxcJmHouse" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_jm_house
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jmId != null">jm_id,</if>
+            <if test="houseId != null">house_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jmId != null">#{jmId},</if>
+            <if test="houseId != null">#{houseId},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSzxcJmHouse" parameterType="SzxcJmHouse">
+        update szxc_jm_house
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jmId != null">jm_id = #{jmId},</if>
+            <if test="houseId != null">house_id = #{houseId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSzxcJmHouseById" parameterType="Long">
+        delete from szxc_jm_house where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcJmHouseByIds" parameterType="String">
+        delete from szxc_jm_house where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmTagMapper.xml

@@ -5,30 +5,31 @@
 <mapper namespace="com.ruoyi.szxc.mapper.SzxcJmTagMapper">
 
     <resultMap type="SzxcJmTag" id="SzxcJmTagResult">
+        <result property="id"    column="id"    />
         <result property="jmId"    column="jm_id"    />
         <result property="tagId"    column="tag_id"    />
         <result property="tagName"    column="tag_name"    />
     </resultMap>
 
     <sql id="selectSzxcJmTagVo">
-        select jm_id, tag_id, tag_name from szxc_jm_tag
+        select id, jm_id, tag_id, tag_name from szxc_jm_tag
     </sql>
 
     <select id="selectSzxcJmTagList" parameterType="SzxcJmTag" resultMap="SzxcJmTagResult">
         <include refid="selectSzxcJmTagVo"/>
         <where>
-            <if test=" jmId!= null "> and jm_id=#{jmId}</if>
+            <if test="jmId != null "> and jm_id = #{jmId}</if>
-            <if test=" tagId!= null "> and tag_id=#{tagId}</if>
+            <if test="tagId != null "> and tag_id = #{tagId}</if>
             <if test="tagName != null  and tagName != ''"> and tag_name like concat('%', #{tagName}, '%')</if>
         </where>
     </select>
 
-    <select id="selectSzxcJmTagByJmId" parameterType="Long" resultMap="SzxcJmTagResult">
+    <select id="selectSzxcJmTagById" parameterType="Long" resultMap="SzxcJmTagResult">
         <include refid="selectSzxcJmTagVo"/>
-        where jm_id = #{jmId}
+        where id = #{id}
     </select>
 
-    <insert id="insertSzxcJmTag" parameterType="SzxcJmTag">
+    <insert id="insertSzxcJmTag" parameterType="SzxcJmTag" useGeneratedKeys="true" keyProperty="id">
         insert into szxc_jm_tag
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="jmId != null">jm_id,</if>
@@ -45,20 +46,21 @@
     <update id="updateSzxcJmTag" parameterType="SzxcJmTag">
         update szxc_jm_tag
         <trim prefix="SET" suffixOverrides=",">
+            <if test="jmId != null">jm_id = #{jmId},</if>
             <if test="tagId != null">tag_id = #{tagId},</if>
             <if test="tagName != null">tag_name = #{tagName},</if>
         </trim>
-        where jm_id = #{jmId}
+        where id = #{id}
     </update>
 
-    <delete id="deleteSzxcJmTagByJmId" parameterType="Long">
+    <delete id="deleteSzxcJmTagById" parameterType="Long">
-        delete from szxc_jm_tag where jm_id = #{jmId}
+        delete from szxc_jm_tag where id = #{id}
     </delete>
 
-    <delete id="deleteSzxcJmTagByJmIds" parameterType="String">
+    <delete id="deleteSzxcJmTagByIds" parameterType="String">
-        delete from szxc_jm_tag where jm_id in
+        delete from szxc_jm_tag where id in
-        <foreach item="jmId" collection="array" open="(" separator="," close=")">
+        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{jmId}
+            #{id}
         </foreach>
     </delete>
 </mapper>

ruoyi-ui/src/views/szxc/cs_fw/index.vue

@@ -1,6 +1,22 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="场所id" prop="csId">
+        <el-input
+          v-model="queryParams.csId"
+          placeholder="请输入场所id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="房屋id" prop="fwId">
+        <el-input
+          v-model="queryParams.fwId"
+          placeholder="请输入房屋id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="房屋名称" prop="fwName">
         <el-input
           v-model="queryParams.fwName"
@@ -63,6 +79,7 @@
 
     <el-table v-loading="loading" :data="cs_fwList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="场所id" align="center" prop="csId" />
       <el-table-column label="房屋id" align="center" prop="fwId" />
       <el-table-column label="房屋名称" align="center" prop="fwName" />
@@ -138,6 +155,8 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
+          csId: null,
+          fwId: null,
           fwName: null
         },
         // 表单参数
@@ -171,6 +190,7 @@
       // 表单重置
       reset() {
         this.form = {
+          id: null,
           csId: null,
           fwId: null,
           fwName: null
@@ -189,7 +209,7 @@
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.csId)
+        this.ids = selection.map(item => item.id)
         this.single = selection.length!==1
         this.multiple = !selection.length
       },
@@ -202,8 +222,8 @@
       /** 修改按钮操作 */
       handleUpdate(row) {
         this.reset();
-        const csId = row.csId || this.ids
+        const id = row.id || this.ids
-        getCs_fw(csId).then(response => {
+        getCs_fw(id).then(response => {
           this.form = response.data;
           this.open = true;
           this.title = "修改场所房屋关联";
@@ -213,7 +233,7 @@
       submitForm() {
         this.$refs["form"].validate(valid => {
           if (valid) {
-            if (this.form.csId != null) {
+            if (this.form.id != null) {
               updateCs_fw(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
@@ -231,9 +251,9 @@
       },
       /** 删除按钮操作 */
       handleDelete(row) {
-        const csIds = row.csId || this.ids;
+        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除场所房屋关联编号为"' + csIds + '"的数据项？').then(function() {
+        this.$modal.confirm('是否确认删除场所房屋关联编号为"' + ids + '"的数据项？').then(function() {
-          return delCs_fw(csIds);
+          return delCs_fw(ids);
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");