diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcCsFwController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcCsFwController.java index 42c020f..3303137 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcCsFwController.java +++ b/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 com.ruoyi.common.core.page.TableDataInfo; +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-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}") - public AjaxResult getInfo(@PathVariable("csId") Long csId) + @GetMapping(value = "/{id}") + 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}") - public AjaxResult remove(@PathVariable Long[] csIds) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(szxcCsFwService.deleteSzxcCsFwByCsIds(csIds)); + return toAjax(szxcCsFwService.deleteSzxcCsFwByIds(ids)); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmCarController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmCarController.java new file mode 100644 index 0000000..e080ed5 --- /dev/null +++ b/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 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 list = szxcJmCarService.selectSzxcJmCarList(szxcJmCar); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmHouseController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmHouseController.java new file mode 100644 index 0000000..9720faa --- /dev/null +++ b/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 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 list = szxcJmHouseService.selectSzxcJmHouseList(szxcJmHouse); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmTagController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmTagController.java index 6ff4722..359c819 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmTagController.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmTagController.java @@ -18,9 +18,9 @@ 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}") - public AjaxResult getInfo(@PathVariable("jmId") Long jmId) + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(szxcJmTagService.selectSzxcJmTagByJmId(jmId)); + return success(szxcJmTagService.selectSzxcJmTagById(id)); } /** @@ -70,7 +70,7 @@ public class SzxcJmTagController extends BaseController @PreAuthorize("@ss.hasPermi('szxc:jmtag:add')") @Log(title = "居民标签关联", businessType = BusinessType.UPDATE) @PostMapping("/addAll") - public AjaxResult addAll(@RequestBody JSONObject json) + public AjaxResult addAll(@RequestBody JSONObject json) { List szxcJmTags = json.getJSONArray("szxcJmTags").toJavaList(SzxcJmTag.class); return toAjax(szxcJmTagService.insertSzxcJmTags(szxcJmTags)); @@ -103,9 +103,9 @@ public class SzxcJmTagController extends BaseController */ @PreAuthorize("@ss.hasPermi('szxc:jmtag:remove')") @Log(title = "居民标签关联", businessType = BusinessType.DELETE) - @DeleteMapping("/{jmIds}") - public AjaxResult remove(@PathVariable Long[] jmIds) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(szxcJmTagService.deleteSzxcJmTagByJmIds(jmIds)); + return toAjax(szxcJmTagService.deleteSzxcJmTagByIds(ids)); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcCsFwMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcCsFwMapper.java index 959fd32..d006d3e 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcCsFwMapper.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcCsFwMapper.java @@ -6,23 +6,23 @@ import java.util.List; /** * 场所房屋关联Mapper接口 - * + * * @author hs - * @date 2024-03-29 + * @date 2024-03-30 */ -public interface SzxcCsFwMapper +public interface SzxcCsFwMapper { /** * 查询场所房屋关联 - * - * @param csId 场所房屋关联主键 + * + * @param id 场所房屋关联主键 * @return 场所房屋关联 */ - public SzxcCsFw selectSzxcCsFwByCsId(Long csId); + public SzxcCsFw selectSzxcCsFwById(Long id); /** * 查询场所房屋关联列表 - * + * * @param szxcCsFw 场所房屋关联 * @return 场所房屋关联集合 */ @@ -30,7 +30,7 @@ public interface SzxcCsFwMapper /** * 新增场所房屋关联 - * + * * @param szxcCsFw 场所房屋关联 * @return 结果 */ @@ -38,7 +38,7 @@ public interface SzxcCsFwMapper /** * 修改场所房屋关联 - * + * * @param szxcCsFw 场所房屋关联 * @return 结果 */ @@ -46,17 +46,17 @@ 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); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmCarMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmCarMapper.java index 0379ba5..689b030 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmCarMapper.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmCarMapper.java @@ -6,23 +6,23 @@ import java.util.List; /** * 居民车辆关联Mapper接口 - * + * * @author hs - * @date 2024-03-16 + * @date 2024-03-30 */ -public interface SzxcJmCarMapper +public interface SzxcJmCarMapper { /** * 查询居民车辆关联 - * - * @param jmId 居民车辆关联主键 + * + * @param id 居民车辆关联主键 * @return 居民车辆关联 */ - public SzxcJmCar selectSzxcJmCarByJmId(Long jmId); + public SzxcJmCar selectSzxcJmCarById(Long id); /** * 查询居民车辆关联列表 - * + * * @param szxcJmCar 居民车辆关联 * @return 居民车辆关联集合 */ @@ -30,7 +30,7 @@ public interface SzxcJmCarMapper /** * 新增居民车辆关联 - * + * * @param szxcJmCar 居民车辆关联 * @return 结果 */ @@ -38,7 +38,7 @@ public interface SzxcJmCarMapper /** * 修改居民车辆关联 - * + * * @param szxcJmCar 居民车辆关联 * @return 结果 */ @@ -46,17 +46,17 @@ 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); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmHouseMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmHouseMapper.java index b609386..401aef6 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmHouseMapper.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmHouseMapper.java @@ -1,27 +1,28 @@ 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 +public interface SzxcJmHouseMapper { /** * 查询居民房屋关联 - * - * @param jmId 居民房屋关联主键 + * + * @param id 居民房屋关联主键 * @return 居民房屋关联 */ - public SzxcJmHouse selectSzxcJmHouseByJmId(Long jmId); + public SzxcJmHouse selectSzxcJmHouseById(Long id); /** * 查询居民房屋关联列表 - * + * * @param szxcJmHouse 居民房屋关联 * @return 居民房屋关联集合 */ @@ -29,7 +30,7 @@ public interface SzxcJmHouseMapper /** * 新增居民房屋关联 - * + * * @param szxcJmHouse 居民房屋关联 * @return 结果 */ @@ -37,7 +38,7 @@ public interface SzxcJmHouseMapper /** * 修改居民房屋关联 - * + * * @param szxcJmHouse 居民房屋关联 * @return 结果 */ @@ -45,17 +46,17 @@ 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); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmTagMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmTagMapper.java index 9b0986e..44bafb2 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmTagMapper.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmTagMapper.java @@ -1,27 +1,28 @@ 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 +public interface SzxcJmTagMapper { /** * 查询居民标签关联 - * - * @param jmId 居民标签关联主键 + * + * @param id 居民标签关联主键 * @return 居民标签关联 */ - public SzxcJmTag selectSzxcJmTagByJmId(Long jmId); + public SzxcJmTag selectSzxcJmTagById(Long id); /** * 查询居民标签关联列表 - * + * * @param szxcJmTag 居民标签关联 * @return 居民标签关联集合 */ @@ -29,7 +30,7 @@ public interface SzxcJmTagMapper /** * 新增居民标签关联 - * + * * @param szxcJmTag 居民标签关联 * @return 结果 */ @@ -37,7 +38,7 @@ public interface SzxcJmTagMapper /** * 修改居民标签关联 - * + * * @param szxcJmTag 居民标签关联 * @return 结果 */ @@ -45,17 +46,24 @@ 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); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcCsFwService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcCsFwService.java index df5f232..5d36e76 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcCsFwService.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcCsFwService.java @@ -6,23 +6,23 @@ import java.util.List; /** * 场所房屋关联Service接口 - * + * * @author hs - * @date 2024-03-29 + * @date 2024-03-30 */ -public interface ISzxcCsFwService +public interface ISzxcCsFwService { /** * 查询场所房屋关联 - * - * @param csId 场所房屋关联主键 + * + * @param id 场所房屋关联主键 * @return 场所房屋关联 */ - public SzxcCsFw selectSzxcCsFwByCsId(Long csId); + public SzxcCsFw selectSzxcCsFwById(Long id); /** * 查询场所房屋关联列表 - * + * * @param szxcCsFw 场所房屋关联 * @return 场所房屋关联集合 */ @@ -30,7 +30,7 @@ public interface ISzxcCsFwService /** * 新增场所房屋关联 - * + * * @param szxcCsFw 场所房屋关联 * @return 结果 */ @@ -38,7 +38,7 @@ public interface ISzxcCsFwService /** * 修改场所房屋关联 - * + * * @param szxcCsFw 场所房屋关联 * @return 结果 */ @@ -46,17 +46,17 @@ 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); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmCarService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmCarService.java index 3537de9..4dae8e4 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmCarService.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmCarService.java @@ -6,23 +6,23 @@ import java.util.List; /** * 居民车辆关联Service接口 - * + * * @author hs - * @date 2024-03-16 + * @date 2024-03-30 */ -public interface ISzxcJmCarService +public interface ISzxcJmCarService { /** * 查询居民车辆关联 - * - * @param jmId 居民车辆关联主键 + * + * @param id 居民车辆关联主键 * @return 居民车辆关联 */ - public SzxcJmCar selectSzxcJmCarByJmId(Long jmId); + public SzxcJmCar selectSzxcJmCarById(Long id); /** * 查询居民车辆关联列表 - * + * * @param szxcJmCar 居民车辆关联 * @return 居民车辆关联集合 */ @@ -30,7 +30,7 @@ public interface ISzxcJmCarService /** * 新增居民车辆关联 - * + * * @param szxcJmCar 居民车辆关联 * @return 结果 */ @@ -38,7 +38,7 @@ public interface ISzxcJmCarService /** * 修改居民车辆关联 - * + * * @param szxcJmCar 居民车辆关联 * @return 结果 */ @@ -46,17 +46,17 @@ 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); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmHouseService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmHouseService.java index 7b3ac9d..bad771f 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmHouseService.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmHouseService.java @@ -1,27 +1,28 @@ 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 +public interface ISzxcJmHouseService { /** * 查询居民房屋关联 - * - * @param jmId 居民房屋关联主键 + * + * @param id 居民房屋关联主键 * @return 居民房屋关联 */ - public SzxcJmHouse selectSzxcJmHouseByJmId(Long jmId); + public SzxcJmHouse selectSzxcJmHouseById(Long id); /** * 查询居民房屋关联列表 - * + * * @param szxcJmHouse 居民房屋关联 * @return 居民房屋关联集合 */ @@ -29,7 +30,7 @@ public interface ISzxcJmHouseService /** * 新增居民房屋关联 - * + * * @param szxcJmHouse 居民房屋关联 * @return 结果 */ @@ -37,7 +38,7 @@ public interface ISzxcJmHouseService /** * 修改居民房屋关联 - * + * * @param szxcJmHouse 居民房屋关联 * @return 结果 */ @@ -45,17 +46,17 @@ 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); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmTagService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmTagService.java index 2178734..0bab702 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmTagService.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmTagService.java @@ -6,23 +6,23 @@ import java.util.List; /** * 居民标签关联Service接口 - * + * * @author hs - * @date 2024-03-21 + * @date 2024-03-30 */ -public interface ISzxcJmTagService +public interface ISzxcJmTagService { /** * 查询居民标签关联 - * - * @param jmId 居民标签关联主键 + * + * @param id 居民标签关联主键 * @return 居民标签关联 */ - public SzxcJmTag selectSzxcJmTagByJmId(Long jmId); + public SzxcJmTag selectSzxcJmTagById(Long id); /** * 查询居民标签关联列表 - * + * * @param szxcJmTag 居民标签关联 * @return 居民标签关联集合 */ @@ -30,15 +30,22 @@ public interface ISzxcJmTagService /** * 新增居民标签关联 - * + * * @param szxcJmTag 居民标签关联 * @return 结果 */ public int insertSzxcJmTag(SzxcJmTag szxcJmTag); + /** + * 新增、修改居民标签集合关联 + * @param szxcJmTags + * @return + */ + public int insertSzxcJmTags(List szxcJmTags); + /** * 修改居民标签关联 - * + * * @param szxcJmTag 居民标签关联 * @return 结果 */ @@ -46,19 +53,17 @@ 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); - - int insertSzxcJmTags(List szxcJmTags); + public int deleteSzxcJmTagById(Long id); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcCsFwServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcCsFwServiceImpl.java index 811b8d8..efac6cb 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcCsFwServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcCsFwServiceImpl.java @@ -10,31 +10,31 @@ import java.util.List; /** * 场所房屋关联Service业务层处理 - * + * * @author hs - * @date 2024-03-29 + * @date 2024-03-30 */ @Service -public class SzxcCsFwServiceImpl implements ISzxcCsFwService +public class SzxcCsFwServiceImpl implements ISzxcCsFwService { @Autowired private SzxcCsFwMapper szxcCsFwMapper; /** * 查询场所房屋关联 - * - * @param csId 场所房屋关联主键 + * + * @param id 场所房屋关联主键 * @return 场所房屋关联 */ @Override - public SzxcCsFw selectSzxcCsFwByCsId(Long csId) + public SzxcCsFw selectSzxcCsFwById(Long id) { - return szxcCsFwMapper.selectSzxcCsFwByCsId(csId); + return szxcCsFwMapper.selectSzxcCsFwById(id); } /** * 查询场所房屋关联列表 - * + * * @param szxcCsFw 场所房屋关联 * @return 场所房屋关联 */ @@ -46,7 +46,7 @@ public class SzxcCsFwServiceImpl implements ISzxcCsFwService /** * 新增场所房屋关联 - * + * * @param szxcCsFw 场所房屋关联 * @return 结果 */ @@ -58,7 +58,7 @@ public class SzxcCsFwServiceImpl implements ISzxcCsFwService /** * 修改场所房屋关联 - * + * * @param szxcCsFw 场所房屋关联 * @return 结果 */ @@ -70,25 +70,25 @@ 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); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmCarServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmCarServiceImpl.java index efdacae..5cede70 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmCarServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmCarServiceImpl.java @@ -10,31 +10,31 @@ import java.util.List; /** * 居民车辆关联Service业务层处理 - * + * * @author hs - * @date 2024-03-16 + * @date 2024-03-30 */ @Service -public class SzxcJmCarServiceImpl implements ISzxcJmCarService +public class SzxcJmCarServiceImpl implements ISzxcJmCarService { @Autowired private SzxcJmCarMapper szxcJmCarMapper; /** * 查询居民车辆关联 - * - * @param jmId 居民车辆关联主键 + * + * @param id 居民车辆关联主键 * @return 居民车辆关联 */ @Override - public SzxcJmCar selectSzxcJmCarByJmId(Long jmId) + public SzxcJmCar selectSzxcJmCarById(Long id) { - return szxcJmCarMapper.selectSzxcJmCarByJmId(jmId); + return szxcJmCarMapper.selectSzxcJmCarById(id); } /** * 查询居民车辆关联列表 - * + * * @param szxcJmCar 居民车辆关联 * @return 居民车辆关联 */ @@ -46,7 +46,7 @@ public class SzxcJmCarServiceImpl implements ISzxcJmCarService /** * 新增居民车辆关联 - * + * * @param szxcJmCar 居民车辆关联 * @return 结果 */ @@ -58,7 +58,7 @@ public class SzxcJmCarServiceImpl implements ISzxcJmCarService /** * 修改居民车辆关联 - * + * * @param szxcJmCar 居民车辆关联 * @return 结果 */ @@ -70,25 +70,25 @@ 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); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmHouseServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmHouseServiceImpl.java index ef1300e..e13ea8f 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmHouseServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmHouseServiceImpl.java @@ -1,39 +1,40 @@ 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 +public class SzxcJmHouseServiceImpl implements ISzxcJmHouseService { @Autowired private SzxcJmHouseMapper szxcJmHouseMapper; /** * 查询居民房屋关联 - * - * @param jmId 居民房屋关联主键 + * + * @param id 居民房屋关联主键 * @return 居民房屋关联 */ @Override - public SzxcJmHouse selectSzxcJmHouseByJmId(Long jmId) + public SzxcJmHouse selectSzxcJmHouseById(Long id) { - return szxcJmHouseMapper.selectSzxcJmHouseByJmId(jmId); + return szxcJmHouseMapper.selectSzxcJmHouseById(id); } /** * 查询居民房屋关联列表 - * + * * @param szxcJmHouse 居民房屋关联 * @return 居民房屋关联 */ @@ -45,7 +46,7 @@ public class SzxcJmHouseServiceImpl implements ISzxcJmHouseService /** * 新增居民房屋关联 - * + * * @param szxcJmHouse 居民房屋关联 * @return 结果 */ @@ -57,7 +58,7 @@ public class SzxcJmHouseServiceImpl implements ISzxcJmHouseService /** * 修改居民房屋关联 - * + * * @param szxcJmHouse 居民房屋关联 * @return 结果 */ @@ -69,25 +70,25 @@ 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); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmTagServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmTagServiceImpl.java index 71ac308..6cffb08 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmTagServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmTagServiceImpl.java @@ -3,39 +3,39 @@ 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 +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); } /** * 查询居民标签关联列表 - * + * * @param szxcJmTag 居民标签关联 * @return 居民标签关联 */ @@ -47,7 +47,7 @@ public class SzxcJmTagServiceImpl implements ISzxcJmTagService /** * 新增居民标签关联 - * + * * @param szxcJmTag 居民标签关联 * @return 结果 */ @@ -85,7 +85,7 @@ public class SzxcJmTagServiceImpl implements ISzxcJmTagService /** * 修改居民标签关联 - * + * * @param szxcJmTag 居民标签关联 * @return 结果 */ @@ -97,27 +97,25 @@ 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); } - - } diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmTagMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmTagMapper.xml index fa96688..0878ad8 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmTagMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmTagMapper.xml @@ -53,6 +53,11 @@ where id = #{id} + + + delete from szxc_jm_tag where jm_id = #{jmId} + + delete from szxc_jm_tag where id = #{id}