From b66357dd777cb50fc233b3d3b4b539bc4f12db3f Mon Sep 17 00:00:00 2001
From: mi9688 <dqwzam0@163.com>
Date: Tue, 8 Oct 2024 17:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E4=BE=8B=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/gis/GGroupsController.java     |  1 -
 .../controller/gis/GLegendController.java     |  2 +-
 .../com/fastbee/ggroup/domain/GLegend.java    |  5 +++++
 .../service/impl/GSitesServiceImpl.java       | 22 ++++++++++++++-----
 4 files changed, 23 insertions(+), 7 deletions(-)

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 a85a303..b62c483 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
@@ -54,7 +54,6 @@ public class GGroupsController extends BaseController
     {
         super.startPage();
         List<GGroupSiteVo> list = gGroupsService.selectGGroupsListSites(gGroups);
-        list.forEach(System.err::println);
         return super.getDataTable(list);
     }
 
diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java
index 8b5938a..5cd93f6 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java
@@ -31,7 +31,7 @@ import com.fastbee.common.core.page.TableDataInfo;
  * @date 2024-10-08
  */
 @RestController
-@RequestMapping("/ggroup/legend")
+@RequestMapping("/gis/legend")
 @Api(tags = "图例")
 public class GLegendController extends BaseController
 {
diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegend.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegend.java
index f8e1413..18a61c5 100644
--- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegend.java
+++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegend.java
@@ -36,4 +36,9 @@ public class GLegend extends BaseEntity
     @ApiModelProperty("图标名称")
     private String name;
 
+    /** 项目id */
+    @Excel(name = "项目id")
+    @ApiModelProperty("项目id")
+    private Long projectId;
+
 }
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 a96aeb6..f85fb42 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,6 +1,7 @@
 package com.fastbee.ggroup.service.impl;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -74,6 +75,7 @@ public class GSitesServiceImpl extends ServiceImpl<GSiteGroupsMapper,GSiteGroups
         gSites.setName(gGroupSiteDto.getName().trim());
         gSites.setType(gGroupSiteDto.getType());
         gSites.setIcon(gGroupSiteDto.getIcon());
+        gSites.setProjectId(gGroupSiteDto.getProjectId());
         //根据名称判断是否存在该站点
         GSites gSites1 = gSitesMapper.selectOne(new LambdaQueryWrapper<GSites>()
                 .select(GSites::getName, GSites::getId)
@@ -97,11 +99,22 @@ public class GSitesServiceImpl extends ServiceImpl<GSiteGroupsMapper,GSiteGroups
      */
     @Override
     public int updateGSites(GSitesEditDto gSitesEditDto) {
+        //查修改前站点名称
+        GSites gSites = gSitesMapper.selectGSitesById(gSitesEditDto.getId());
+        if (Objects.isNull(gSites)) {
+            throw new ServiceException("修改站点不存在！");
+        }
+        //判断修改后是否和修改前一致
+        if(gSites.getName().trim().equals(gSitesEditDto.getName().trim())){
+            return 1;
+        }
+
         //不能有重复名字的站点
         GSites gSites1 = gSitesMapper.selectOne(new LambdaQueryWrapper<GSites>()
                 .select(GSites::getName, GSites::getId)
                 .eq(GSites::getName, gSitesEditDto.getName().trim()));
-        if (gSites1 != null) {
+
+        if (Objects.nonNull(gSites1)) {
             throw new ServiceException("站点名称已存在！");
         }
         GSites sites = new GSites();
@@ -130,13 +143,12 @@ public class GSitesServiceImpl extends ServiceImpl<GSiteGroupsMapper,GSiteGroups
     @Transactional(rollbackFor = Exception.class)
     public int deleteGSitesById(Long id) {
         GSiteGroups gSiteGroups = gSiteGroupsMapper.selectGSiteGroupsById(id);
-        if (gSiteGroups == null) {
+        if (Objects.isNull(gSiteGroups)) {
             throw new ServiceException("站点不存在");
         }
-        int deleted = gSitesMapper.deleteById(gSiteGroups.getSiteId());
+//        int deleted = gSitesMapper.deleteById(gSiteGroups.getSiteId());
         //删除关系
-        int deleted1 = gSiteGroupsMapper.deleteById(id);
-        return deleted == 1 && deleted1 == 1 ? 1 : 0;
+        return gSiteGroupsMapper.deleteById(id);
     }
 
     @Override