From 237da907018c5a2a0447dc145d6fb5b25b9873e7 Mon Sep 17 00:00:00 2001 From: mi9688 Date: Mon, 30 Sep 2024 15:38:12 +0800 Subject: [PATCH] =?UTF-8?q?gis=E7=BB=84=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/gis/GGroupsController.java | 30 ++++++- .../data/controller/gis/GSitesController.java | 18 +++- .../fastbee/ggroup/domain/GSiteGroups.java | 48 ++++++++++ .../com/fastbee/ggroup/domain/GSites.java | 4 + .../ggroup/domain/dto/GGroupSiteDto.java | 17 ++++ .../GGroupSite.java => vo/GGroupSiteVo.java} | 6 +- .../fastbee/ggroup/enums/GroupTagEnum.java | 35 ++++++++ .../fastbee/ggroup/mapper/GGroupsMapper.java | 6 +- .../ggroup/mapper/GSiteGroupsMapper.java | 63 ++++++++++++++ .../fastbee/ggroup/mapper/GSitesMapper.java | 18 +++- .../ggroup/service/IGGroupsService.java | 4 +- .../ggroup/service/IGSitesService.java | 5 +- .../service/impl/GGroupsServiceImpl.java | 4 +- .../service/impl/GSitesServiceImpl.java | 37 ++++++-- .../resources/mapper/ggroup/GGroupsMapper.xml | 2 +- .../mapper/ggroup/GSiteGroupsMapper.xml | 87 +++++++++++++++++++ .../resources/mapper/ggroup/GSitesMapper.xml | 48 +++++----- 17 files changed, 378 insertions(+), 54 deletions(-) create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteGroups.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GGroupSiteDto.java rename fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/{dto/GGroupSite.java => vo/GGroupSiteVo.java} (78%) create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/enums/GroupTagEnum.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteGroupsMapper.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteGroupsMapper.xml diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GGroupsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GGroupsController.java index 4b28412..a85a303 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GGroupsController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GGroupsController.java @@ -5,7 +5,8 @@ import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.core.page.TableDataInfo; import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.ggroup.domain.GGroups; -import com.fastbee.ggroup.domain.dto.GGroupSite; +import com.fastbee.ggroup.domain.vo.GGroupSiteVo; +import com.fastbee.ggroup.enums.GroupTagEnum; import com.fastbee.ggroup.service.IGGroupsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -14,7 +15,9 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.util.List; +import java.util.*; + +import static java.util.stream.Collectors.toList; /** * 组Controller @@ -50,11 +53,32 @@ public class GGroupsController extends BaseController public TableDataInfo listSite(GGroups gGroups) { super.startPage(); - List list = gGroupsService.selectGGroupsListSites(gGroups); + List list = gGroupsService.selectGGroupsListSites(gGroups); + list.forEach(System.err::println); return super.getDataTable(list); } + /** + * 获取组的标签(类别) + */ + @PreAuthorize("@ss.hasPermi('iot:groups:list')") + @GetMapping("/list-label") + @ApiOperation("获取组的标签(类别)") + public AjaxResult listLabel() { + // 使用传统的方式将枚举转换为列表 + List> labelList = new ArrayList<>(); + + for (GroupTagEnum tag : GroupTagEnum.values()) { + Map map = new HashMap<>(); + map.put("code", tag.getCode()); + map.put("value", tag.getDescription()); + labelList.add(map); + } + + return AjaxResult.success(labelList); + } + /** * 导出组列表 */ 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 aebd6b0..c537b64 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 @@ -3,6 +3,7 @@ package com.fastbee.data.controller.gis; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.fastbee.ggroup.domain.dto.GGroupSiteDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -81,9 +82,9 @@ public class GSitesController extends BaseController @PreAuthorize("@ss.hasPermi('ggroup:sites:add')") @PostMapping @ApiOperation("新增站点") - public AjaxResult add(@RequestBody GSites gSites) + public AjaxResult add(@RequestBody GGroupSiteDto gGroupSiteDto) { - return toAjax(gSitesService.insertGSites(gSites)); + return toAjax(gSitesService.insertGSites(gGroupSiteDto)); } /** @@ -97,11 +98,22 @@ public class GSitesController extends BaseController return toAjax(gSitesService.updateGSites(gSites)); } + /** + * 根据id删除站点 + */ + @PreAuthorize("@ss.hasPermi('ggroup:sites:remove')") + @DeleteMapping("/{id}") + @ApiOperation("根据id删除站点") + public AjaxResult remove(@PathVariable Long id){ + return toAjax(gSitesService.deleteGSitesById(id)); + } + + /** * 删除站点 */ @PreAuthorize("@ss.hasPermi('ggroup:sites:remove')") - @DeleteMapping("/{ids}") + @DeleteMapping("/batch/{ids}") @ApiOperation("删除站点") public AjaxResult remove(@PathVariable Long[] ids) { diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteGroups.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteGroups.java new file mode 100644 index 0000000..4fac4da --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteGroups.java @@ -0,0 +1,48 @@ +package com.fastbee.ggroup.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.fastbee.common.annotation.Excel; +import com.fastbee.common.core.domain.BaseEntity; + +/** + * 站点组关系对象 g_site_groups + * + * @author kerwincui + * @date 2024-09-30 + */ +@ApiModel(value = "GSiteGroups",description = "站点组关系 g_site_groups") +@Data +@EqualsAndHashCode(callSuper = true) +public class GSiteGroups extends BaseEntity + { +private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 站点id */ + @Excel(name = "站点id") + @ApiModelProperty("站点id") + private Long siteId; + + /** 组id(关联表g_group的id) */ + @Excel(name = "组id(关联表g_group的id)") + @ApiModelProperty("组id(关联表g_group的id)") + private Long parentId; + + /** 项目id */ + @Excel(name = "项目id") + @ApiModelProperty("项目id") + private Long projectId; + + /** 排序 */ + @Excel(name = "排序") + @ApiModelProperty("排序") + private Long orderNum; + +} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java index ac2bbc6..babcc6f 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java @@ -1,7 +1,10 @@ package com.fastbee.ggroup.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -23,6 +26,7 @@ public class GSites extends BaseEntity private static final long serialVersionUID = 1L; /** 主键 */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /** 站点名称 */ diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GGroupSiteDto.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GGroupSiteDto.java new file mode 100644 index 0000000..fbf3f75 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GGroupSiteDto.java @@ -0,0 +1,17 @@ +package com.fastbee.ggroup.domain.dto; + +import lombok.Data; + +@Data +public class GGroupSiteDto { + private Long parentId; // 父节点id + private String parentName; // 父节点名称 + private Long siteId; // 站点id + private String name; // 站点名称 + private String icon; // 站点图标 + private String type; // 站点类型 + private String space; // 站点空间 + private Integer orderNum;// 排序 + private Long projectId;//项目id + +} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GGroupSite.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/vo/GGroupSiteVo.java similarity index 78% rename from fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GGroupSite.java rename to fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/vo/GGroupSiteVo.java index 1caebf7..938e566 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GGroupSite.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/vo/GGroupSiteVo.java @@ -1,9 +1,10 @@ -package com.fastbee.ggroup.domain.dto; +package com.fastbee.ggroup.domain.vo; import lombok.Data; @Data -public class GGroupSite { +public class GGroupSiteVo { + private Long id; // 对应 gsg.id private Long parentId; // 对应 gsg.group_id private String parentName; // 对应 gg.name private Long siteId; // 对应 gsg.site_id @@ -11,6 +12,5 @@ public class GGroupSite { private String icon; // 对应 gs.icon private String type; // 对应 gs.type private String space; // 对应 gs.space - // Getter 和 Setter } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/enums/GroupTagEnum.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/enums/GroupTagEnum.java new file mode 100644 index 0000000..9bd9097 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/enums/GroupTagEnum.java @@ -0,0 +1,35 @@ +package com.fastbee.ggroup.enums; + +public enum GroupTagEnum { + RIVERS_LAKES(1, "江河湖泊"), + WATER_CONSERVANCY_PROJECTS(2, "水利工程"), + MONITORING_STATIONS(3, "检测站点"), + OTHER_OBJECTS(4, "其他对象"), + WATER_AFFAIRS(5, "水利事务"), + ALARM_EVENTS(6, "报警事件"); + + private final int code; + private final String description; + + GroupTagEnum(int code, String description) { + this.code = code; + this.description = description; + } + + public int getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static GroupTagEnum fromCode(int code) { + for (GroupTagEnum tag : GroupTagEnum.values()) { + if (tag.getCode() == code) { + return tag; + } + } + throw new IllegalArgumentException("No tag found with code: " + code); + } +} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GGroupsMapper.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GGroupsMapper.java index b914246..d442e57 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GGroupsMapper.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GGroupsMapper.java @@ -3,7 +3,7 @@ package com.fastbee.ggroup.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fastbee.ggroup.domain.GGroups; -import com.fastbee.ggroup.domain.dto.GGroupSite; +import com.fastbee.ggroup.domain.vo.GGroupSiteVo; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,7 +36,7 @@ public interface GGroupsMapper extends BaseMapper @Select({ "" }) - List selectGGroupsSiteList(GGroups gGroups); + List selectGGroupsSiteList(GGroups gGroups); /** * 新增组 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 new file mode 100644 index 0000000..6680e0c --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteGroupsMapper.java @@ -0,0 +1,63 @@ +package com.fastbee.ggroup.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fastbee.ggroup.domain.GSiteGroups; + +/** + * 站点组关系Mapper接口 + * + * @author kerwincui + * @date 2024-09-30 + */ +public interface GSiteGroupsMapper extends BaseMapper +{ + /** + * 查询站点组关系 + * + * @param id 站点组关系主键 + * @return 站点组关系 + */ + public GSiteGroups selectGSiteGroupsById(Long id); + + /** + * 查询站点组关系列表 + * + * @param gSiteGroups 站点组关系 + * @return 站点组关系集合 + */ + public List selectGSiteGroupsList(GSiteGroups gSiteGroups); + + /** + * 新增站点组关系 + * + * @param gSiteGroups 站点组关系 + * @return 结果 + */ + public int insertGSiteGroups(GSiteGroups gSiteGroups); + + /** + * 修改站点组关系 + * + * @param gSiteGroups 站点组关系 + * @return 结果 + */ + public int updateGSiteGroups(GSiteGroups gSiteGroups); + + /** + * 删除站点组关系 + * + * @param id 站点组关系主键 + * @return 结果 + */ + public 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 ccf8815..ca8f348 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 @@ -1,7 +1,13 @@ package com.fastbee.ggroup.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fastbee.ggroup.domain.GSites; +import com.fastbee.ggroup.domain.dto.GGroupSiteDto; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Param; /** * 站点Mapper接口 @@ -9,7 +15,7 @@ import com.fastbee.ggroup.domain.GSites; * @author kerwincui * @date 2024-09-29 */ -public interface GSitesMapper +public interface GSitesMapper extends BaseMapper { /** * 查询站点 @@ -30,10 +36,12 @@ public interface GSitesMapper /** * 新增站点 * - * @param gSites 站点 + * @param gGroupSiteDto 站点 * @return 结果 */ - public int insertGSites(GSites gSites); + @Insert("insert into g_site_groups (site_id, parent_id, project_id,order_num) " + + "value (#{siteId},#{parentId},#{projectId},#{orderNum})") + public int insertGSites(GGroupSiteDto gGroupSiteDto); /** * 修改站点 @@ -49,7 +57,9 @@ public interface GSitesMapper * @param id 站点主键 * @return 结果 */ - public int deleteGSitesById(Long id); + +// @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/IGGroupsService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGGroupsService.java index c3d1e96..7db2ae4 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGGroupsService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGGroupsService.java @@ -4,7 +4,7 @@ package com.fastbee.ggroup.service; import com.fastbee.ggroup.domain.GGroups; -import com.fastbee.ggroup.domain.dto.GGroupSite; +import com.fastbee.ggroup.domain.vo.GGroupSiteVo; import java.util.List; @@ -32,7 +32,7 @@ public interface IGGroupsService */ public List selectGGroupsList(GGroups gGroups); - public List selectGGroupsListSites(GGroups gGroups); + public List selectGGroupsListSites(GGroups gGroups); /** * 新增组 * 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 67a0de1..171175a 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 @@ -2,6 +2,7 @@ package com.fastbee.ggroup.service; import java.util.List; import com.fastbee.ggroup.domain.GSites; +import com.fastbee.ggroup.domain.dto.GGroupSiteDto; /** * 站点Service接口 @@ -30,10 +31,10 @@ public interface IGSitesService /** * 新增站点 * - * @param gSites 站点 + * @param gGroupSiteDto 站点 * @return 结果 */ - public int insertGSites(GSites gSites); + public int insertGSites(GGroupSiteDto gGroupSiteDto); /** * 修改站点 diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java index 69ff242..85163d8 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java @@ -3,7 +3,7 @@ package com.fastbee.ggroup.service.impl; import com.fastbee.common.utils.DateUtils; import com.fastbee.ggroup.domain.GGroups; -import com.fastbee.ggroup.domain.dto.GGroupSite; +import com.fastbee.ggroup.domain.vo.GGroupSiteVo; import com.fastbee.ggroup.mapper.GGroupsMapper; import com.fastbee.ggroup.service.IGGroupsService; import org.springframework.beans.factory.annotation.Autowired; @@ -57,7 +57,7 @@ public class GGroupsServiceImpl implements IGGroupsService } @Override - public List selectGGroupsListSites(GGroups gGroups) { + public List selectGGroupsListSites(GGroups gGroups) { return gGroupsMapper.selectGGroupsSiteList(gGroups); } 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 fb7d8d4..1c4136b 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 @@ -2,11 +2,15 @@ package com.fastbee.ggroup.service.impl; import java.util.List; import com.fastbee.common.utils.DateUtils; +import com.fastbee.ggroup.domain.GSiteGroups; +import com.fastbee.ggroup.domain.dto.GGroupSiteDto; +import com.fastbee.ggroup.mapper.GSiteGroupsMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.fastbee.ggroup.mapper.GSitesMapper; import com.fastbee.ggroup.domain.GSites; import com.fastbee.ggroup.service.IGSitesService; +import org.springframework.transaction.annotation.Transactional; /** * 站点Service业务层处理 @@ -20,6 +24,9 @@ public class GSitesServiceImpl implements IGSitesService @Autowired private GSitesMapper gSitesMapper; + @Autowired + private GSiteGroupsMapper gSiteGroupsMapper; + /** * 查询站点 * @@ -47,14 +54,22 @@ public class GSitesServiceImpl implements IGSitesService /** * 新增站点 * - * @param gSites 站点 + * @param gGroupSiteDto 站点 * @return 结果 */ @Override - public int insertGSites(GSites gSites) - { - gSites.setCreateTime(DateUtils.getNowDate()); - return gSitesMapper.insertGSites(gSites); + @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()); + + int inserted = gSitesMapper.insert(gSites); + gGroupSiteDto.setSiteId(gSites.getId()); + int inserted1 = gSitesMapper.insertGSites(gGroupSiteDto); + return inserted==1&&inserted1==1?1:0 ; } /** @@ -67,7 +82,7 @@ public class GSitesServiceImpl implements IGSitesService public int updateGSites(GSites gSites) { gSites.setUpdateTime(DateUtils.getNowDate()); - return gSitesMapper.updateGSites(gSites); + return gSitesMapper.updateById(gSites); } /** @@ -89,8 +104,16 @@ public class GSitesServiceImpl implements IGSitesService * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int deleteGSitesById(Long id) { - return gSitesMapper.deleteGSitesById(id); + GSiteGroups gSiteGroups =gSiteGroupsMapper.selectGSiteGroupsById(id); + if(gSiteGroups==null){ + throw new RuntimeException("站点不存在"); + } + int deleted= gSitesMapper.deleteById(gSiteGroups.getId()); + //删除关系 + int deleted1=gSiteGroupsMapper.deleteById(id); + return deleted==1&&deleted1==1?1:0 ; } } 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 17ea35e..e1e1c10 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 @@ -20,7 +20,7 @@ - + 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 new file mode 100644 index 0000000..feca599 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteGroupsMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + 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 + + site_id, + parent_id, + create_by, + create_time, + update_time, + update_by, + project_id, + order_num, + + + #{siteId}, + #{parentId}, + #{createBy}, + #{createTime}, + #{updateTime}, + #{updateBy}, + #{projectId}, + #{orderNum}, + + + + + 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 ae17ff7..83c3fa0 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 @@ -35,29 +35,29 @@ where id = #{id} - - insert into g_sites - - name, - icon, - type, - create_by, - create_time, - update_time, - update_by, - space, - - - #{name}, - #{icon}, - #{type}, - #{createBy}, - #{createTime}, - #{updateTime}, - #{updateBy}, - #{space}, - - + + + + + + + + + + + + + + + + + + + + + + + update g_sites @@ -75,7 +75,7 @@ - delete from g_sites where id = #{id} + delete from g_site_groups where id = #{id}