添加TrackName和serviceId唯一性校验

禁用TraceName修改功能

Author: saleson

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/dao/model/GrayTrackDO.java

@@ -11,7 +11,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
-@Table(name = "gray_track", indexes = {@Index(columnList = "serviceId"), @Index(columnList = "instanceId")})
+@Table(name = "gray_track", indexes = {@Index(columnList = "serviceId,name", unique = true), @Index(columnList = "instanceId")})
 public class GrayTrackDO {
 
     @Id

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/dao/repository/GrayTrackRepository.java

@@ -12,6 +12,7 @@
 @Repository
 public interface GrayTrackRepository extends JpaRepository<GrayTrackDO, Long> {
 
+    GrayTrackDO findFirstByServiceIdAndNameOrderById(String serviceId, String name);
 
     Page<GrayTrackDO> findAllByInstanceId(String instanceId, Pageable pageable);
 

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/gray/GrayServerTrackModule.java

@@ -9,6 +9,8 @@
 public interface GrayServerTrackModule {
 
 
+    GrayTrack findFirstGrayTrack(String serviceId, String name);
+
     Page<GrayTrack> listGrayTracks(String serviceId, Pageable pageable);
 
     Page<GrayTrack> listGrayTracks(Pageable pageable);

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/gray/jpa/JPAGrayServerTrackModule.java

@@ -23,6 +23,11 @@ public JPAGrayServerTrackModule(
         this.grayTrackService = grayTrackService;
     }
 
+    @Override
+    public GrayTrack findFirstGrayTrack(String serviceId, String name) {
+        return grayTrackService.findFirstGrayTrack(serviceId, name);
+    }
+
     @Override
     public Page<GrayTrack> listGrayTracks(String serviceId, Pageable pageable) {
         return grayTrackService.listGrayTracks(serviceId, pageable);

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/rest/GrayTrackResource.java

@@ -20,6 +20,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import static cn.springcloud.gray.api.ApiRes.CODE_SUCCESS;
 
@@ -115,6 +116,10 @@ public ApiRes<GrayTrack> save(@RequestBody GrayTrack track) {
         if (!serviceManageModule.hasServiceAuthority(track.getServiceId())) {
             return ApiResHelper.notAuthority();
         }
+        if (Objects.isNull(track.getId())
+                && Objects.nonNull(grayServerTrackModule.findFirstGrayTrack(track.getServiceId(), track.getName()))) {
+            return ApiResHelper.failed(String.format("service '%s' 已有'%s'类型的追踪", track.getServiceId(), track.getName()));
+        }
         track.setOperator(userModule.getCurrentUserId());
         track.setOperateTime(new Date());
         return ApiRes.<GrayTrack>builder()

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/service/GrayTrackService.java

@@ -58,4 +58,8 @@ public Page<GrayTrack> listGrayTracks(Pageable pageable) {
         Page<GrayTrackDO> page = repository.findAll(pageable);
         return PaginationUtils.convert(pageable, page, getModelMapper());
     }
+
+    public GrayTrack findFirstGrayTrack(String serviceId, String name) {
+        return do2model(repository.findFirstByServiceIdAndNameOrderById(serviceId, name));
+    }
 }

spring-cloud-gray-webui/src/views/gray-trackor/complex-table.vue

@@ -79,6 +79,7 @@
             <el-select
               v-model="temp.type"
               placeholder="请选择"
+              :disabled="dialogStatus=='update'"
             >
               <el-option
                 v-for="item in options"
@@ -289,7 +290,6 @@ export default {
     createData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
           this.temp.author = 'vue-element-admin'
           if (this.temp.type !== '自定义名称') {
             this.temp.name = this.temp.type