From 3dd9a2385e2f57598d619ab146a64565df5be2ac Mon Sep 17 00:00:00 2001 From: hansha Date: Thu, 21 Mar 2024 15:48:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A0=87=E7=AD=BE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=BC=96=E5=86=99=E3=80=81=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../szxc/controller/SzxcJmTagController.java | 35 +++++++++++-------- .../ruoyi/szxc/service/ISzxcJmTagService.java | 2 ++ .../service/impl/SzxcJmTagServiceImpl.java | 33 +++++++++++++++-- .../resources/mapper/szxc/SzxcJmTagMapper.xml | 2 ++ 4 files changed, 56 insertions(+), 16 deletions(-) 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 e9600e8..6ff4722 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 @@ -1,25 +1,20 @@ 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.alibaba.fastjson2.JSONObject; 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.SzxcJmTag; import com.ruoyi.szxc.service.ISzxcJmTagService; -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 @@ -69,6 +64,18 @@ public class SzxcJmTagController extends BaseController return success(szxcJmTagService.selectSzxcJmTagByJmId(jmId)); } + /** + * 新增、修改、删除居民标签集合关联 + */ + @PreAuthorize("@ss.hasPermi('szxc:jmtag:add')") + @Log(title = "居民标签关联", businessType = BusinessType.UPDATE) + @PostMapping("/addAll") + public AjaxResult addAll(@RequestBody JSONObject json) + { + List szxcJmTags = json.getJSONArray("szxcJmTags").toJavaList(SzxcJmTag.class); + return toAjax(szxcJmTagService.insertSzxcJmTags(szxcJmTags)); + } + /** * 新增居民标签关联 */ 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 14f16d0..2178734 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 @@ -59,4 +59,6 @@ public interface ISzxcJmTagService * @return 结果 */ public int deleteSzxcJmTagByJmId(Long jmId); + + int insertSzxcJmTags(List szxcJmTags); } 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 feda89c..71ac308 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,9 +3,10 @@ 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; /** @@ -17,7 +18,7 @@ import java.util.List; @Service public class SzxcJmTagServiceImpl implements ISzxcJmTagService { - @Autowired + @Resource private SzxcJmTagMapper szxcJmTagMapper; /** @@ -56,6 +57,32 @@ public class SzxcJmTagServiceImpl implements ISzxcJmTagService return szxcJmTagMapper.insertSzxcJmTag(szxcJmTag); } + /** + * 新增、修改居民标签集合关联 + * @param szxcJmTags + * @return + */ + @Override + @Transactional + public int insertSzxcJmTags(List szxcJmTags) { + int result=1; + try { + if(szxcJmTags!=null&&szxcJmTags.size()>0){ + //1.删除该居民id下的所有关联关系 + szxcJmTagMapper.deleteSzxcJmTagByJmId(szxcJmTags.get(0).getJmId()); + //存储所有的 + for(SzxcJmTag szxcJmTag:szxcJmTags){ + szxcJmTagMapper.insertSzxcJmTag(szxcJmTag); + } + } + } catch (Exception e) { + result=0; + e.printStackTrace(); + } + + return result; + } + /** * 修改居民标签关联 * @@ -91,4 +118,6 @@ public class SzxcJmTagServiceImpl implements ISzxcJmTagService { return szxcJmTagMapper.deleteSzxcJmTagByJmId(jmId); } + + } diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmTagMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmTagMapper.xml index 546a836..856a906 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmTagMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmTagMapper.xml @@ -17,6 +17,8 @@