修改

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcCsFwController.java

@@ -1,31 +1,25 @@
 package com.ruoyi.szxc.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.szxc.domain.SzxcCsFw;
 import com.ruoyi.szxc.service.ISzxcCsFwService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 场所房屋关联Controller
  *
  * @author hs
- * @date 2024-03-29
+ * @date 2024-03-30
  */
 @RestController
 @RequestMapping("/szxc/cs_fw")
@@ -63,10 +57,10 @@ public class SzxcCsFwController extends BaseController
      * 获取场所房屋关联详细信息
      */
     @PreAuthorize("@ss.hasPermi('szxc:cs_fw:query')")
-    @GetMapping(value = "/{csId}")
+    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("csId") Long csId)
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(szxcCsFwService.selectSzxcCsFwByCsId(csId));
+        return success(szxcCsFwService.selectSzxcCsFwById(id));
     }
 
     /**
@@ -96,9 +90,9 @@ public class SzxcCsFwController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('szxc:cs_fw:remove')")
     @Log(title = "场所房屋关联", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{csIds}")
+    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] csIds)
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(szxcCsFwService.deleteSzxcCsFwByCsIds(csIds));
+        return toAjax(szxcCsFwService.deleteSzxcCsFwByIds(ids));
     }
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmCarController.java

@@ -0,0 +1,98 @@
+package com.ruoyi.szxc.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.szxc.domain.SzxcJmCar;
+import com.ruoyi.szxc.service.ISzxcJmCarService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 居民车辆关联Controller
+ *
+ * @author hs
+ * @date 2024-03-30
+ */
+@RestController
+@RequestMapping("/szxc/jmcar")
+public class SzxcJmCarController extends BaseController
+{
+    @Autowired
+    private ISzxcJmCarService szxcJmCarService;
+
+    /**
+     * 查询居民车辆关联列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:jmcar:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcJmCar szxcJmCar)
+    {
+        startPage();
+        List<SzxcJmCar> list = szxcJmCarService.selectSzxcJmCarList(szxcJmCar);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出居民车辆关联列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:jmcar:export')")
+    @Log(title = "居民车辆关联", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcJmCar szxcJmCar)
+    {
+        List<SzxcJmCar> list = szxcJmCarService.selectSzxcJmCarList(szxcJmCar);
+        ExcelUtil<SzxcJmCar> util = new ExcelUtil<SzxcJmCar>(SzxcJmCar.class);
+        util.exportExcel(response, list, "居民车辆关联数据");
+    }
+
+    /**
+     * 获取居民车辆关联详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:jmcar:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcJmCarService.selectSzxcJmCarById(id));
+    }
+
+    /**
+     * 新增居民车辆关联
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:jmcar:add')")
+    @Log(title = "居民车辆关联", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcJmCar szxcJmCar)
+    {
+        return toAjax(szxcJmCarService.insertSzxcJmCar(szxcJmCar));
+    }
+
+    /**
+     * 修改居民车辆关联
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:jmcar:edit')")
+    @Log(title = "居民车辆关联", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcJmCar szxcJmCar)
+    {
+        return toAjax(szxcJmCarService.updateSzxcJmCar(szxcJmCar));
+    }
+
+    /**
+     * 删除居民车辆关联
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:jmcar:remove')")
+    @Log(title = "居民车辆关联", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcJmCarService.deleteSzxcJmCarByIds(ids));
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmHouseController.java

@@ -0,0 +1,98 @@
+package com.ruoyi.szxc.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.szxc.domain.SzxcJmHouse;
+import com.ruoyi.szxc.service.ISzxcJmHouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 居民房屋关联Controller
+ *
+ * @author hs
+ * @date 2024-03-30
+ */
+@RestController
+@RequestMapping("/szxc/jmhouse")
+public class SzxcJmHouseController extends BaseController
+{
+    @Autowired
+    private ISzxcJmHouseService szxcJmHouseService;
+
+    /**
+     * 查询居民房屋关联列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:jmhouse:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcJmHouse szxcJmHouse)
+    {
+        startPage();
+        List<SzxcJmHouse> list = szxcJmHouseService.selectSzxcJmHouseList(szxcJmHouse);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出居民房屋关联列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:jmhouse:export')")
+    @Log(title = "居民房屋关联", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcJmHouse szxcJmHouse)
+    {
+        List<SzxcJmHouse> list = szxcJmHouseService.selectSzxcJmHouseList(szxcJmHouse);
+        ExcelUtil<SzxcJmHouse> util = new ExcelUtil<SzxcJmHouse>(SzxcJmHouse.class);
+        util.exportExcel(response, list, "居民房屋关联数据");
+    }
+
+    /**
+     * 获取居民房屋关联详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:jmhouse:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcJmHouseService.selectSzxcJmHouseById(id));
+    }
+
+    /**
+     * 新增居民房屋关联
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:jmhouse:add')")
+    @Log(title = "居民房屋关联", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcJmHouse szxcJmHouse)
+    {
+        return toAjax(szxcJmHouseService.insertSzxcJmHouse(szxcJmHouse));
+    }
+
+    /**
+     * 修改居民房屋关联
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:jmhouse:edit')")
+    @Log(title = "居民房屋关联", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcJmHouse szxcJmHouse)
+    {
+        return toAjax(szxcJmHouseService.updateSzxcJmHouse(szxcJmHouse));
+    }
+
+    /**
+     * 删除居民房屋关联
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:jmhouse:remove')")
+    @Log(title = "居民房屋关联", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcJmHouseService.deleteSzxcJmHouseByIds(ids));
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmTagController.java

@@ -20,7 +20,7 @@ import java.util.List;
  * 居民标签关联Controller
  *
  * @author hs
- * @date 2024-03-21
+ * @date 2024-03-30
  */
 @RestController
 @RequestMapping("/szxc/jmtag")
@@ -58,10 +58,10 @@ public class SzxcJmTagController extends BaseController
      * 获取居民标签关联详细信息
      */
     @PreAuthorize("@ss.hasPermi('szxc:jmtag:query')")
-    @GetMapping(value = "/{jmId}")
+    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("jmId") Long jmId)
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(szxcJmTagService.selectSzxcJmTagByJmId(jmId));
+        return success(szxcJmTagService.selectSzxcJmTagById(id));
     }
 
     /**
@@ -103,9 +103,9 @@ public class SzxcJmTagController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('szxc:jmtag:remove')")
     @Log(title = "居民标签关联", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{jmIds}")
+    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] jmIds)
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(szxcJmTagService.deleteSzxcJmTagByJmIds(jmIds));
+        return toAjax(szxcJmTagService.deleteSzxcJmTagByIds(ids));
     }
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcCsFwMapper.java

@@ -8,17 +8,17 @@ import java.util.List;
  * 场所房屋关联Mapper接口
  *
  * @author hs
- * @date 2024-03-29
+ * @date 2024-03-30
  */
 public interface SzxcCsFwMapper
 {
     /**
      * 查询场所房屋关联
      *
-     * @param csId 场所房屋关联主键
+     * @param id 场所房屋关联主键
      * @return 场所房屋关联
      */
-    public SzxcCsFw selectSzxcCsFwByCsId(Long csId);
+    public SzxcCsFw selectSzxcCsFwById(Long id);
 
     /**
      * 查询场所房屋关联列表
@@ -47,16 +47,16 @@ public interface SzxcCsFwMapper
     /**
      * 删除场所房屋关联
      *
-     * @param csId 场所房屋关联主键
+     * @param id 场所房屋关联主键
      * @return 结果
      */
-    public int deleteSzxcCsFwByCsId(Long csId);
+    public int deleteSzxcCsFwById(Long id);
 
     /**
      * 批量删除场所房屋关联
      *
-     * @param csIds 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteSzxcCsFwByCsIds(Long[] csIds);
+    public int deleteSzxcCsFwByIds(Long[] ids);
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmCarMapper.java

@@ -8,17 +8,17 @@ import java.util.List;
  * 居民车辆关联Mapper接口
  *
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-30
  */
 public interface SzxcJmCarMapper
 {
     /**
      * 查询居民车辆关联
      *
-     * @param jmId 居民车辆关联主键
+     * @param id 居民车辆关联主键
      * @return 居民车辆关联
      */
-    public SzxcJmCar selectSzxcJmCarByJmId(Long jmId);
+    public SzxcJmCar selectSzxcJmCarById(Long id);
 
     /**
      * 查询居民车辆关联列表
@@ -47,16 +47,16 @@ public interface SzxcJmCarMapper
     /**
      * 删除居民车辆关联
      *
-     * @param jmId 居民车辆关联主键
+     * @param id 居民车辆关联主键
      * @return 结果
      */
-    public int deleteSzxcJmCarByJmId(Long jmId);
+    public int deleteSzxcJmCarById(Long id);
 
     /**
      * 批量删除居民车辆关联
      *
-     * @param jmIds 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteSzxcJmCarByJmIds(Long[] jmIds);
+    public int deleteSzxcJmCarByIds(Long[] ids);
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmHouseMapper.java

@@ -1,23 +1,24 @@
 package com.ruoyi.szxc.mapper;
 
-import java.util.List;
 import com.ruoyi.szxc.domain.SzxcJmHouse;
 
+import java.util.List;
+
 /**
  * 居民房屋关联Mapper接口
  *
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-30
  */
 public interface SzxcJmHouseMapper
 {
     /**
      * 查询居民房屋关联
      *
-     * @param jmId 居民房屋关联主键
+     * @param id 居民房屋关联主键
      * @return 居民房屋关联
      */
-    public SzxcJmHouse selectSzxcJmHouseByJmId(Long jmId);
+    public SzxcJmHouse selectSzxcJmHouseById(Long id);
 
     /**
      * 查询居民房屋关联列表
@@ -46,16 +47,16 @@ public interface SzxcJmHouseMapper
     /**
      * 删除居民房屋关联
      *
-     * @param jmId 居民房屋关联主键
+     * @param id 居民房屋关联主键
      * @return 结果
      */
-    public int deleteSzxcJmHouseByJmId(Long jmId);
+    public int deleteSzxcJmHouseById(Long id);
 
     /**
      * 批量删除居民房屋关联
      *
-     * @param jmIds 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteSzxcJmHouseByJmIds(Long[] jmIds);
+    public int deleteSzxcJmHouseByIds(Long[] ids);
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmTagMapper.java

@@ -1,23 +1,24 @@
 package com.ruoyi.szxc.mapper;
 
-import java.util.List;
 import com.ruoyi.szxc.domain.SzxcJmTag;
 
+import java.util.List;
+
 /**
  * 居民标签关联Mapper接口
  *
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-30
  */
 public interface SzxcJmTagMapper
 {
     /**
      * 查询居民标签关联
      *
-     * @param jmId 居民标签关联主键
+     * @param id 居民标签关联主键
      * @return 居民标签关联
      */
-    public SzxcJmTag selectSzxcJmTagByJmId(Long jmId);
+    public SzxcJmTag selectSzxcJmTagById(Long id);
 
     /**
      * 查询居民标签关联列表
@@ -46,16 +47,23 @@ public interface SzxcJmTagMapper
     /**
      * 删除居民标签关联
      *
-     * @param jmId 居民标签关联主键
+     * @param id 居民标签关联主键
      * @return 结果
      */
-    public int deleteSzxcJmTagByJmId(Long jmId);
+    public int deleteSzxcJmTagById(Long id);
 
     /**
      * 批量删除居民标签关联
      *
-     * @param jmIds 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteSzxcJmTagByJmIds(Long[] jmIds);
+    public int deleteSzxcJmTagByIds(Long[] ids);
+
+    /**
+     * 根据jmid删除
+     * @param jmId
+     * @return
+     */
+    public int deleteSzxcJmTagByJmId(Long jmId);
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcCsFwService.java

@@ -8,17 +8,17 @@ import java.util.List;
  * 场所房屋关联Service接口
  *
  * @author hs
- * @date 2024-03-29
+ * @date 2024-03-30
  */
 public interface ISzxcCsFwService
 {
     /**
      * 查询场所房屋关联
      *
-     * @param csId 场所房屋关联主键
+     * @param id 场所房屋关联主键
      * @return 场所房屋关联
      */
-    public SzxcCsFw selectSzxcCsFwByCsId(Long csId);
+    public SzxcCsFw selectSzxcCsFwById(Long id);
 
     /**
      * 查询场所房屋关联列表
@@ -47,16 +47,16 @@ public interface ISzxcCsFwService
     /**
      * 批量删除场所房屋关联
      *
-     * @param csIds 需要删除的场所房屋关联主键集合
+     * @param ids 需要删除的场所房屋关联主键集合
      * @return 结果
      */
-    public int deleteSzxcCsFwByCsIds(Long[] csIds);
+    public int deleteSzxcCsFwByIds(Long[] ids);
 
     /**
      * 删除场所房屋关联信息
      *
-     * @param csId 场所房屋关联主键
+     * @param id 场所房屋关联主键
      * @return 结果
      */
-    public int deleteSzxcCsFwByCsId(Long csId);
+    public int deleteSzxcCsFwById(Long id);
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmCarService.java

@@ -8,17 +8,17 @@ import java.util.List;
  * 居民车辆关联Service接口
  *
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-30
  */
 public interface ISzxcJmCarService
 {
     /**
      * 查询居民车辆关联
      *
-     * @param jmId 居民车辆关联主键
+     * @param id 居民车辆关联主键
      * @return 居民车辆关联
      */
-    public SzxcJmCar selectSzxcJmCarByJmId(Long jmId);
+    public SzxcJmCar selectSzxcJmCarById(Long id);
 
     /**
      * 查询居民车辆关联列表
@@ -47,16 +47,16 @@ public interface ISzxcJmCarService
     /**
      * 批量删除居民车辆关联
      *
-     * @param jmIds 需要删除的居民车辆关联主键集合
+     * @param ids 需要删除的居民车辆关联主键集合
      * @return 结果
      */
-    public int deleteSzxcJmCarByJmIds(Long[] jmIds);
+    public int deleteSzxcJmCarByIds(Long[] ids);
 
     /**
      * 删除居民车辆关联信息
      *
-     * @param jmId 居民车辆关联主键
+     * @param id 居民车辆关联主键
      * @return 结果
      */
-    public int deleteSzxcJmCarByJmId(Long jmId);
+    public int deleteSzxcJmCarById(Long id);
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmHouseService.java

@@ -1,23 +1,24 @@
 package com.ruoyi.szxc.service;
 
-import java.util.List;
 import com.ruoyi.szxc.domain.SzxcJmHouse;
 
+import java.util.List;
+
 /**
  * 居民房屋关联Service接口
  *
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-30
  */
 public interface ISzxcJmHouseService
 {
     /**
      * 查询居民房屋关联
      *
-     * @param jmId 居民房屋关联主键
+     * @param id 居民房屋关联主键
      * @return 居民房屋关联
      */
-    public SzxcJmHouse selectSzxcJmHouseByJmId(Long jmId);
+    public SzxcJmHouse selectSzxcJmHouseById(Long id);
 
     /**
      * 查询居民房屋关联列表
@@ -46,16 +47,16 @@ public interface ISzxcJmHouseService
     /**
      * 批量删除居民房屋关联
      *
-     * @param jmIds 需要删除的居民房屋关联主键集合
+     * @param ids 需要删除的居民房屋关联主键集合
      * @return 结果
      */
-    public int deleteSzxcJmHouseByJmIds(Long[] jmIds);
+    public int deleteSzxcJmHouseByIds(Long[] ids);
 
     /**
      * 删除居民房屋关联信息
      *
-     * @param jmId 居民房屋关联主键
+     * @param id 居民房屋关联主键
      * @return 结果
      */
-    public int deleteSzxcJmHouseByJmId(Long jmId);
+    public int deleteSzxcJmHouseById(Long id);
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmTagService.java

@@ -8,17 +8,17 @@ import java.util.List;
  * 居民标签关联Service接口
  *
  * @author hs
- * @date 2024-03-21
+ * @date 2024-03-30
  */
 public interface ISzxcJmTagService
 {
     /**
      * 查询居民标签关联
      *
-     * @param jmId 居民标签关联主键
+     * @param id 居民标签关联主键
      * @return 居民标签关联
      */
-    public SzxcJmTag selectSzxcJmTagByJmId(Long jmId);
+    public SzxcJmTag selectSzxcJmTagById(Long id);
 
     /**
      * 查询居民标签关联列表
@@ -36,6 +36,13 @@ public interface ISzxcJmTagService
      */
     public int insertSzxcJmTag(SzxcJmTag szxcJmTag);
 
+    /**
+     * 新增、修改居民标签集合关联
+     * @param szxcJmTags
+     * @return
+     */
+    public int insertSzxcJmTags(List<SzxcJmTag> szxcJmTags);
+
     /**
      * 修改居民标签关联
      *
@@ -47,18 +54,16 @@ public interface ISzxcJmTagService
     /**
      * 批量删除居民标签关联
      *
-     * @param jmIds 需要删除的居民标签关联主键集合
+     * @param ids 需要删除的居民标签关联主键集合
      * @return 结果
      */
-    public int deleteSzxcJmTagByJmIds(Long[] jmIds);
+    public int deleteSzxcJmTagByIds(Long[] ids);
 
     /**
      * 删除居民标签关联信息
      *
-     * @param jmId 居民标签关联主键
+     * @param id 居民标签关联主键
      * @return 结果
      */
-    public int deleteSzxcJmTagByJmId(Long jmId);
+    public int deleteSzxcJmTagById(Long id);
-
-    int insertSzxcJmTags(List<SzxcJmTag> szxcJmTags);
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcCsFwServiceImpl.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 场所房屋关联Service业务层处理
  *
  * @author hs
- * @date 2024-03-29
+ * @date 2024-03-30
  */
 @Service
 public class SzxcCsFwServiceImpl implements ISzxcCsFwService
@@ -23,13 +23,13 @@ public class SzxcCsFwServiceImpl implements ISzxcCsFwService
     /**
      * 查询场所房屋关联
      *
-     * @param csId 场所房屋关联主键
+     * @param id 场所房屋关联主键
      * @return 场所房屋关联
      */
     @Override
-    public SzxcCsFw selectSzxcCsFwByCsId(Long csId)
+    public SzxcCsFw selectSzxcCsFwById(Long id)
     {
-        return szxcCsFwMapper.selectSzxcCsFwByCsId(csId);
+        return szxcCsFwMapper.selectSzxcCsFwById(id);
     }
 
     /**
@@ -71,24 +71,24 @@ public class SzxcCsFwServiceImpl implements ISzxcCsFwService
     /**
      * 批量删除场所房屋关联
      *
-     * @param csIds 需要删除的场所房屋关联主键
+     * @param ids 需要删除的场所房屋关联主键
      * @return 结果
      */
     @Override
-    public int deleteSzxcCsFwByCsIds(Long[] csIds)
+    public int deleteSzxcCsFwByIds(Long[] ids)
     {
-        return szxcCsFwMapper.deleteSzxcCsFwByCsIds(csIds);
+        return szxcCsFwMapper.deleteSzxcCsFwByIds(ids);
     }
 
     /**
      * 删除场所房屋关联信息
      *
-     * @param csId 场所房屋关联主键
+     * @param id 场所房屋关联主键
      * @return 结果
      */
     @Override
-    public int deleteSzxcCsFwByCsId(Long csId)
+    public int deleteSzxcCsFwById(Long id)
     {
-        return szxcCsFwMapper.deleteSzxcCsFwByCsId(csId);
+        return szxcCsFwMapper.deleteSzxcCsFwById(id);
     }
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmCarServiceImpl.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 居民车辆关联Service业务层处理
  *
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-30
  */
 @Service
 public class SzxcJmCarServiceImpl implements ISzxcJmCarService
@@ -23,13 +23,13 @@ public class SzxcJmCarServiceImpl implements ISzxcJmCarService
     /**
      * 查询居民车辆关联
      *
-     * @param jmId 居民车辆关联主键
+     * @param id 居民车辆关联主键
      * @return 居民车辆关联
      */
     @Override
-    public SzxcJmCar selectSzxcJmCarByJmId(Long jmId)
+    public SzxcJmCar selectSzxcJmCarById(Long id)
     {
-        return szxcJmCarMapper.selectSzxcJmCarByJmId(jmId);
+        return szxcJmCarMapper.selectSzxcJmCarById(id);
     }
 
     /**
@@ -71,24 +71,24 @@ public class SzxcJmCarServiceImpl implements ISzxcJmCarService
     /**
      * 批量删除居民车辆关联
      *
-     * @param jmIds 需要删除的居民车辆关联主键
+     * @param ids 需要删除的居民车辆关联主键
      * @return 结果
      */
     @Override
-    public int deleteSzxcJmCarByJmIds(Long[] jmIds)
+    public int deleteSzxcJmCarByIds(Long[] ids)
     {
-        return szxcJmCarMapper.deleteSzxcJmCarByJmIds(jmIds);
+        return szxcJmCarMapper.deleteSzxcJmCarByIds(ids);
     }
 
     /**
      * 删除居民车辆关联信息
      *
-     * @param jmId 居民车辆关联主键
+     * @param id 居民车辆关联主键
      * @return 结果
      */
     @Override
-    public int deleteSzxcJmCarByJmId(Long jmId)
+    public int deleteSzxcJmCarById(Long id)
     {
-        return szxcJmCarMapper.deleteSzxcJmCarByJmId(jmId);
+        return szxcJmCarMapper.deleteSzxcJmCarById(id);
     }
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmHouseServiceImpl.java

@@ -1,17 +1,18 @@
 package com.ruoyi.szxc.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.szxc.mapper.SzxcJmHouseMapper;
 import com.ruoyi.szxc.domain.SzxcJmHouse;
+import com.ruoyi.szxc.mapper.SzxcJmHouseMapper;
 import com.ruoyi.szxc.service.ISzxcJmHouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 居民房屋关联Service业务层处理
  *
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-30
  */
 @Service
 public class SzxcJmHouseServiceImpl implements ISzxcJmHouseService
@@ -22,13 +23,13 @@ public class SzxcJmHouseServiceImpl implements ISzxcJmHouseService
     /**
      * 查询居民房屋关联
      *
-     * @param jmId 居民房屋关联主键
+     * @param id 居民房屋关联主键
      * @return 居民房屋关联
      */
     @Override
-    public SzxcJmHouse selectSzxcJmHouseByJmId(Long jmId)
+    public SzxcJmHouse selectSzxcJmHouseById(Long id)
     {
-        return szxcJmHouseMapper.selectSzxcJmHouseByJmId(jmId);
+        return szxcJmHouseMapper.selectSzxcJmHouseById(id);
     }
 
     /**
@@ -70,24 +71,24 @@ public class SzxcJmHouseServiceImpl implements ISzxcJmHouseService
     /**
      * 批量删除居民房屋关联
      *
-     * @param jmIds 需要删除的居民房屋关联主键
+     * @param ids 需要删除的居民房屋关联主键
      * @return 结果
      */
     @Override
-    public int deleteSzxcJmHouseByJmIds(Long[] jmIds)
+    public int deleteSzxcJmHouseByIds(Long[] ids)
     {
-        return szxcJmHouseMapper.deleteSzxcJmHouseByJmIds(jmIds);
+        return szxcJmHouseMapper.deleteSzxcJmHouseByIds(ids);
     }
 
     /**
      * 删除居民房屋关联信息
      *
-     * @param jmId 居民房屋关联主键
+     * @param id 居民房屋关联主键
      * @return 结果
      */
     @Override
-    public int deleteSzxcJmHouseByJmId(Long jmId)
+    public int deleteSzxcJmHouseById(Long id)
     {
-        return szxcJmHouseMapper.deleteSzxcJmHouseByJmId(jmId);
+        return szxcJmHouseMapper.deleteSzxcJmHouseById(id);
     }
 }

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmTagServiceImpl.java

@@ -3,34 +3,34 @@ package com.ruoyi.szxc.service.impl;
 import com.ruoyi.szxc.domain.SzxcJmTag;
 import com.ruoyi.szxc.mapper.SzxcJmTagMapper;
 import com.ruoyi.szxc.service.ISzxcJmTagService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
  * 居民标签关联Service业务层处理
  *
  * @author hs
- * @date 2024-03-21
+ * @date 2024-03-30
  */
 @Service
 public class SzxcJmTagServiceImpl implements ISzxcJmTagService
 {
-    @Resource
+    @Autowired
     private SzxcJmTagMapper szxcJmTagMapper;
 
     /**
      * 查询居民标签关联
      *
-     * @param jmId 居民标签关联主键
+     * @param id 居民标签关联主键
      * @return 居民标签关联
      */
     @Override
-    public SzxcJmTag selectSzxcJmTagByJmId(Long jmId)
+    public SzxcJmTag selectSzxcJmTagById(Long id)
     {
-        return szxcJmTagMapper.selectSzxcJmTagByJmId(jmId);
+        return szxcJmTagMapper.selectSzxcJmTagById(id);
     }
 
     /**
@@ -98,26 +98,24 @@ public class SzxcJmTagServiceImpl implements ISzxcJmTagService
     /**
      * 批量删除居民标签关联
      *
-     * @param jmIds 需要删除的居民标签关联主键
+     * @param ids 需要删除的居民标签关联主键
      * @return 结果
      */
     @Override
-    public int deleteSzxcJmTagByJmIds(Long[] jmIds)
+    public int deleteSzxcJmTagByIds(Long[] ids)
     {
-        return szxcJmTagMapper.deleteSzxcJmTagByJmIds(jmIds);
+        return szxcJmTagMapper.deleteSzxcJmTagByIds(ids);
     }
 
     /**
      * 删除居民标签关联信息
      *
-     * @param jmId 居民标签关联主键
+     * @param id 居民标签关联主键
      * @return 结果
      */
     @Override
-    public int deleteSzxcJmTagByJmId(Long jmId)
+    public int deleteSzxcJmTagById(Long id)
     {
-        return szxcJmTagMapper.deleteSzxcJmTagByJmId(jmId);
+        return szxcJmTagMapper.deleteSzxcJmTagById(id);
     }
-
-
 }

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

@@ -53,6 +53,11 @@
         where id = #{id}
     </update>
 
+    <!--删除所有jmid对应的数据 -->
+    <delete id="deleteSzxcJmTagByJmId" parameterType="Long">
+        delete from szxc_jm_tag where jm_id = #{jmId}
+    </delete>
+
     <delete id="deleteSzxcJmTagById" parameterType="Long">
         delete from szxc_jm_tag where id = #{id}
     </delete>