From 762eab8fd19a6b3bd07ee4416de011cee96f4845 Mon Sep 17 00:00:00 2001 From: mi9688 Date: Mon, 30 Sep 2024 17:42:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E7=AE=A1=E7=90=86=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/controller/gis/GSitesController.java | 5 +-- .../ggroup/domain/dto/GSitesEditDto.java | 29 +++++++++++++++ .../ggroup/mapper/GSiteGroupsMapper.java | 33 ++--------------- .../fastbee/ggroup/mapper/GSitesMapper.java | 9 +---- .../ggroup/service/IGSitesService.java | 3 +- .../service/impl/GSitesServiceImpl.java | 31 ++++++++++++---- .../resources/mapper/ggroup/GGroupsMapper.xml | 1 + .../mapper/ggroup/GSiteGroupsMapper.xml | 36 ------------------- .../resources/mapper/ggroup/GSitesMapper.xml | 36 ++----------------- 9 files changed, 66 insertions(+), 117 deletions(-) create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GSitesEditDto.java diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitesController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitesController.java index c537b64..604286e 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitesController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitesController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.fastbee.ggroup.domain.dto.GGroupSiteDto; +import com.fastbee.ggroup.domain.dto.GSitesEditDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -93,9 +94,9 @@ public class GSitesController extends BaseController @PreAuthorize("@ss.hasPermi('ggroup:sites:edit')") @PutMapping @ApiOperation("修改站点") - public AjaxResult edit(@RequestBody GSites gSites) + public AjaxResult edit(@RequestBody GSitesEditDto gSitesEditDto) { - return toAjax(gSitesService.updateGSites(gSites)); + return toAjax(gSitesService.updateGSites(gSitesEditDto)); } /** diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GSitesEditDto.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GSitesEditDto.java new file mode 100644 index 0000000..3b9105e --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GSitesEditDto.java @@ -0,0 +1,29 @@ +package com.fastbee.ggroup.domain.dto; + + +import lombok.Data; + +/** + * 站点编辑对象 g_sites + * + * @author kerwincui + * @date 2024-09-29 + */ +@Data +public class GSitesEditDto + { +private static final long serialVersionUID = 1L; + + private Long id;//站点id + + private String name;//站点名称 + + private String icon;//站点图标 + + private String type;//站点类型 + + private String space;//站点空间 + + private String parentId;//父节点id + +} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteGroupsMapper.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteGroupsMapper.java index 6680e0c..865610c 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteGroupsMapper.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteGroupsMapper.java @@ -13,21 +13,6 @@ import com.fastbee.ggroup.domain.GSiteGroups; */ public interface GSiteGroupsMapper extends BaseMapper { - /** - * 查询站点组关系 - * - * @param id 站点组关系主键 - * @return 站点组关系 - */ - public GSiteGroups selectGSiteGroupsById(Long id); - - /** - * 查询站点组关系列表 - * - * @param gSiteGroups 站点组关系 - * @return 站点组关系集合 - */ - public List selectGSiteGroupsList(GSiteGroups gSiteGroups); /** * 新增站点组关系 @@ -35,15 +20,8 @@ public interface GSiteGroupsMapper extends BaseMapper * @param gSiteGroups 站点组关系 * @return 结果 */ - public int insertGSiteGroups(GSiteGroups gSiteGroups); + int insertGSiteGroups(GSiteGroups gSiteGroups); - /** - * 修改站点组关系 - * - * @param gSiteGroups 站点组关系 - * @return 结果 - */ - public int updateGSiteGroups(GSiteGroups gSiteGroups); /** * 删除站点组关系 @@ -51,13 +29,6 @@ public interface GSiteGroupsMapper extends BaseMapper * @param id 站点组关系主键 * @return 结果 */ - public int deleteGSiteGroupsById(Long id); + int deleteGSiteGroupsById(Long id); - /** - * 批量删除站点组关系 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteGSiteGroupsByIds(Long[] ids); } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSitesMapper.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSitesMapper.java index ca8f348..7bbf405 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSitesMapper.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSitesMapper.java @@ -25,13 +25,7 @@ public interface GSitesMapper extends BaseMapper */ public GSites selectGSitesById(Long id); - /** - * 查询站点列表 - * - * @param gSites 站点 - * @return 站点集合 - */ - public List selectGSitesList(GSites gSites); + /** * 新增站点 @@ -58,7 +52,6 @@ public interface GSitesMapper extends BaseMapper * @return 结果 */ -// @Delete("delete from g_site_groups where id= #{id}") public int deleteGSitesById(@Param("id") Long id); /** diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSitesService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSitesService.java index 171175a..3d3aead 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSitesService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSitesService.java @@ -3,6 +3,7 @@ package com.fastbee.ggroup.service; import java.util.List; import com.fastbee.ggroup.domain.GSites; import com.fastbee.ggroup.domain.dto.GGroupSiteDto; +import com.fastbee.ggroup.domain.dto.GSitesEditDto; /** * 站点Service接口 @@ -42,7 +43,7 @@ public interface IGSitesService * @param gSites 站点 * @return 结果 */ - public int updateGSites(GSites gSites); + public int updateGSites(GSitesEditDto gSitesEditDto); /** * 批量删除站点 diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java index 1c4136b..b4aae93 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java @@ -1,10 +1,17 @@ package com.fastbee.ggroup.service.impl; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Objects; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.fastbee.common.utils.DateUtils; import com.fastbee.ggroup.domain.GSiteGroups; import com.fastbee.ggroup.domain.dto.GGroupSiteDto; +import com.fastbee.ggroup.domain.dto.GSitesEditDto; import com.fastbee.ggroup.mapper.GSiteGroupsMapper; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.fastbee.ggroup.mapper.GSitesMapper; @@ -60,12 +67,18 @@ public class GSitesServiceImpl implements IGSitesService @Override @Transactional(rollbackFor = Exception.class) public int insertGSites(GGroupSiteDto gGroupSiteDto) - { //更新关系表 + { + //插入关系表 GSites gSites = new GSites(); gSites.setName(gGroupSiteDto.getName()); gSites.setType(gGroupSiteDto.getType()); gSites.setIcon(gGroupSiteDto.getIcon()); - + //根据名称判断是否存在该站点 + GSites gSites1=gSitesMapper.selectOne(new LambdaQueryWrapper().eq(GSites::getName,gGroupSiteDto.getName())); + if(gSites1!=null){ + return 1; + } + //插入站点表 int inserted = gSitesMapper.insert(gSites); gGroupSiteDto.setSiteId(gSites.getId()); int inserted1 = gSitesMapper.insertGSites(gGroupSiteDto); @@ -75,14 +88,20 @@ public class GSitesServiceImpl implements IGSitesService /** * 修改站点 * - * @param gSites 站点 + * @param gSitesEditDto 站点 * @return 结果 */ @Override - public int updateGSites(GSites gSites) + public int updateGSites(GSitesEditDto gSitesEditDto) { - gSites.setUpdateTime(DateUtils.getNowDate()); - return gSitesMapper.updateById(gSites); + //不能有重复名字的站点 + GSites gSites1=gSitesMapper.selectOne(new LambdaQueryWrapper().eq(GSites::getName,gSitesEditDto.getName())); + if(gSites1!=null){ + throw new RuntimeException("站点名称已存在!"); + } + GSites sites = new GSites(); + BeanUtils.copyProperties(gSitesEditDto,sites); + return gSitesMapper.updateById(sites); } /** diff --git a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GGroupsMapper.xml b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GGroupsMapper.xml index e1e1c10..c727ca1 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GGroupsMapper.xml +++ b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GGroupsMapper.xml @@ -42,6 +42,7 @@ and project_id = #{projectId} + and tag = #{tag} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteGroupsMapper.xml b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteGroupsMapper.xml index feca599..aa86a4f 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteGroupsMapper.xml +++ b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteGroupsMapper.xml @@ -20,21 +20,6 @@ select id, site_id, parent_id, create_by, create_time, update_time, update_by, project_id, order_num from g_site_groups - - - - insert into g_site_groups @@ -59,29 +44,8 @@ - - update g_site_groups - - site_id = #{siteId}, - parent_id = #{parentId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_time = #{updateTime}, - update_by = #{updateBy}, - project_id = #{projectId}, - order_num = #{orderNum}, - - where id = #{id} - - delete from g_site_groups where id = #{id} - - delete from g_site_groups where id in - - #{id} - - \ No newline at end of file diff --git a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSitesMapper.xml b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSitesMapper.xml index 83c3fa0..fd25fc0 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSitesMapper.xml +++ b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSitesMapper.xml @@ -20,46 +20,16 @@ select id, name, icon, type, create_by, create_time, update_time, update_by, space from g_sites - + - - - - - - - - - - - - - - - - - - - - - - - - + + update g_sites name = #{name},