From f27f6dee53b77b66730030e60c362f007666343e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 12 May 2022 16:07:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20jar=E5=8C=85=E7=AE=A1=E7=90=86=E9=87=8D?=
 =?UTF-8?q?=E5=90=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1013124 --user=陈建星 【项目设置】文件管理-上传jar包，名称校验有问题 https://www.tapd.cn/55049933/s/1157010
---
 .../base/mapper/ext/ExtJarConfigMapper.java   |  2 ++
 .../base/mapper/ext/ExtJarConfigMapper.xml    | 13 +++++++++++
 .../controller/request/JarConfigRequest.java  |  1 +
 .../metersphere/service/JarConfigService.java | 22 +++++++++----------
 .../resources/i18n/messages_en_US.properties  |  1 +
 .../resources/i18n/messages_zh_CN.properties  |  1 +
 .../resources/i18n/messages_zh_TW.properties  |  1 +
 7 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtJarConfigMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtJarConfigMapper.java
index 464ca8c4e9..47af69e1cd 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtJarConfigMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtJarConfigMapper.java
@@ -8,4 +8,6 @@ import java.util.List;
 
 public interface ExtJarConfigMapper {
     List<JarConfig> list(@Param("request") JarConfigRequest request);
+
+    int checkExist(@Param("request") JarConfigRequest request);
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtJarConfigMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtJarConfigMapper.xml
index d6bf8d53fd..518d84edd9 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtJarConfigMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtJarConfigMapper.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="io.metersphere.base.mapper.ext.ExtJarConfigMapper">
+    <select id="checkExist" resultType="integer">
+        select count(*) from jar_config jc
+        <where>
+            jc.name = #{request.name}
+            and jc.id != #{request.id}
+            <if test="request.resourceType == 'WORKSPACE'">
+                and jc.resource_id = #{request.resourceId}
+            </if>
+            <if test="request.resourceType == 'PROJECT'">
+                and (jc.resource_id = #{request.resourceId} or jc.resource_id = #{request.workspaceId})
+            </if>
+        </where>
+    </select>
 
     <select id="list" resultType="io.metersphere.base.domain.JarConfig">
         select * from jar_config jc
diff --git a/backend/src/main/java/io/metersphere/controller/request/JarConfigRequest.java b/backend/src/main/java/io/metersphere/controller/request/JarConfigRequest.java
index 5cb90338aa..036fa48b6b 100644
--- a/backend/src/main/java/io/metersphere/controller/request/JarConfigRequest.java
+++ b/backend/src/main/java/io/metersphere/controller/request/JarConfigRequest.java
@@ -7,6 +7,7 @@ import lombok.Setter;
 @Getter
 @Setter
 public class JarConfigRequest extends BaseQueryRequest {
+    private String id;
     private String resourceId;
     private String resourceType;
 }
diff --git a/backend/src/main/java/io/metersphere/service/JarConfigService.java b/backend/src/main/java/io/metersphere/service/JarConfigService.java
index 54dd0f248b..49cdbc77bb 100644
--- a/backend/src/main/java/io/metersphere/service/JarConfigService.java
+++ b/backend/src/main/java/io/metersphere/service/JarConfigService.java
@@ -19,7 +19,6 @@ import io.metersphere.log.utils.ReflexObjectUtil;
 import io.metersphere.log.vo.DetailColumn;
 import io.metersphere.log.vo.OperatingLogDetails;
 import io.metersphere.log.vo.system.SystemReference;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -51,6 +50,12 @@ public class JarConfigService {
     }
 
     public Pager<List<JarConfig>> list(JarConfigRequest request, int pageNum, int pageSize) {
+        buildQueryRequest(request);
+        Page<Object> page = PageHelper.startPage(pageNum, pageSize, true);
+        return PageUtils.setPageInfo(page, extJarConfigMapper.list(request));
+    }
+
+    public void buildQueryRequest(JarConfigRequest request) {
         if (request.getResourceId() == null || request.getResourceType() == null) {
             MSException.throwException("resourceId or resourceType could not be null!");
         }
@@ -58,8 +63,6 @@ public class JarConfigService {
             Project project = projectService.getProjectById(request.getResourceId());
             request.setWorkspaceId(project.getWorkspaceId());
         }
-        Page<Object> page = PageHelper.startPage(pageNum, pageSize, true);
-        return PageUtils.setPageInfo(page, extJarConfigMapper.list(request));
     }
 
     public JarConfig get(String id) {
@@ -119,14 +122,11 @@ public class JarConfigService {
 
     private void checkExist(JarConfig jarConfig) {
         if (jarConfig.getName() != null) {
-            JarConfigExample example = new JarConfigExample();
-            JarConfigExample.Criteria criteria = example.createCriteria();
-            criteria.andNameEqualTo(jarConfig.getName());
-            if (StringUtils.isNotBlank(jarConfig.getId())) {
-                criteria.andIdNotEqualTo(jarConfig.getId());
-            }
-            if (jarConfigMapper.selectByExample(example).size() > 0) {
-                MSException.throwException(Translator.get("already_exists"));
+            JarConfigRequest request = new JarConfigRequest();
+            BeanUtils.copyBean(request, jarConfig);
+            buildQueryRequest(request);
+            if (extJarConfigMapper.checkExist(request) > 0) {
+                MSException.throwException(Translator.get("name_already_exists"));
             }
         }
     }
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index f4729f09e1..5e233ef985 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -10,6 +10,7 @@ delete_fail=Delete fail
 start_engine_fail=Start fail
 upload_fail=Upload fail
 invalid_parameter=Invalid parameter!
+name_already_exists=Name already exists
 #user related
 user_email_already_exists=User email already exists
 user_id_is_null=User ID cannot be null
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 2fef893944..8bf9aa85ab 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -9,6 +9,7 @@ delete_fail=删除失败
 start_engine_fail=启动失败
 upload_fail=文件上传失败
 invalid_parameter=非法的参数
+name_already_exists=该名称已经存在
 #user related
 user_email_already_exists=用户邮箱已存在
 user_id_is_null=用户ID不能为空
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index fd75d60187..883f4291e3 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -9,6 +9,7 @@ delete_fail=刪除失敗
 start_engine_fail=啟動失敗
 upload_fail=文件上傳失敗
 invalid_parameter=非法的參數
+name_already_exists=該名稱已經存在
 #user related
 user_email_already_exists=用戶郵箱已存在
 user_id_is_null=用戶ID不能為空