From e97791c97c28c392a9829054303cd644fc0b5b78 Mon Sep 17 00:00:00 2001
From: chenjg <17688741996@163.com>
Date: Wed, 5 Jun 2024 16:44:57 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3=E5=85=BC=E5=AE=B9=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/rdm/dao/mapper/ProjectMapper.java  |  2 ++
 .../module/rdm/dao/mapper/ProjectMapper.xml   | 27 +++++++++++++++++++
 .../rdm/service/RdmIssueSyncServiceImpl.java  | 23 ++++++++++++++--
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/main/java/neatlogic/module/rdm/dao/mapper/ProjectMapper.java b/src/main/java/neatlogic/module/rdm/dao/mapper/ProjectMapper.java
index 1b7b7ff..c54308d 100644
--- a/src/main/java/neatlogic/module/rdm/dao/mapper/ProjectMapper.java
+++ b/src/main/java/neatlogic/module/rdm/dao/mapper/ProjectMapper.java
@@ -41,6 +41,8 @@ public interface ProjectMapper {
 
     ProjectVo getProjectById(Long id);
 
+    ProjectVo getProjectByName(String name);
+
     int searchProjectCount(ProjectConditionVo projectVo);
 
     List<ProjectVo> searchProject(ProjectConditionVo projectVo);
diff --git a/src/main/java/neatlogic/module/rdm/dao/mapper/ProjectMapper.xml b/src/main/java/neatlogic/module/rdm/dao/mapper/ProjectMapper.xml
index 2f1c43e..3d37eaf 100644
--- a/src/main/java/neatlogic/module/rdm/dao/mapper/ProjectMapper.xml
+++ b/src/main/java/neatlogic/module/rdm/dao/mapper/ProjectMapper.xml
@@ -326,6 +326,33 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         order by c.sort
     </select>
 
+    <select id="getProjectByName" parameterType="java.lang.String" resultMap="projectResultMap">
+        select a.id,
+               a.name,
+               a.description,
+               a.start_date  AS startDate,
+               a.end_date    AS endDate,
+               a.is_close    AS isClose,
+               a.color,
+               a.template_id AS templateId,
+               a.type        AS type,
+               a.fcd,
+               a.fcu,
+               a.lcd,
+               a.lcu,
+               b.user_id     AS userId,
+               b.user_type   AS userType,
+               c.id          AS appId,
+               c.app_type    AS appType,
+               c.sort        AS appSort,
+               c.config      AS configStr
+        from rdm_project a
+                 LEFT JOIN rdm_project_user b ON a.id = b.project_id
+                 LEFT JOIN rdm_app c ON a.id = c.project_id
+        WHERE a.id = (select `id` from rdm_project where `name` = #{value} limit 1)
+        order by c.sort
+    </select>
+
     <select id="getStatusRelByProjectId" parameterType="java.lang.Long"
             resultType="neatlogic.framework.rdm.dto.ProjectStatusRelVo">
         select id             as id,
diff --git a/src/main/java/neatlogic/module/rdm/service/RdmIssueSyncServiceImpl.java b/src/main/java/neatlogic/module/rdm/service/RdmIssueSyncServiceImpl.java
index d45c96a..2b23a51 100644
--- a/src/main/java/neatlogic/module/rdm/service/RdmIssueSyncServiceImpl.java
+++ b/src/main/java/neatlogic/module/rdm/service/RdmIssueSyncServiceImpl.java
@@ -9,8 +9,11 @@ import neatlogic.framework.dto.plugin.issue.SyncIssueVo;
 import neatlogic.framework.plugin.issue.IssueSyncService;
 import neatlogic.framework.rdm.dto.IssueConditionVo;
 import neatlogic.framework.rdm.dto.IssueVo;
+import neatlogic.framework.rdm.dto.ProjectVo;
 import neatlogic.module.rdm.dao.mapper.IssueMapper;
+import neatlogic.module.rdm.dao.mapper.ProjectMapper;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -36,6 +39,9 @@ public class RdmIssueSyncServiceImpl implements IssueSyncService {
     @Resource
     private IssueMapper issueMapper;
 
+    @Resource
+    private ProjectMapper projectMapper;
+
     @Override
     public String getSource() {
         return "rdm";
@@ -63,9 +69,22 @@ public class RdmIssueSyncServiceImpl implements IssueSyncService {
         List<SyncIssueVo> retList = new ArrayList<>();
         if (project != null) {
 
-            for (String projectId : project) {
+            for (String projectStr : project) {
+                if (StringUtils.isBlank(projectStr)) {
+                    continue;
+                }
+                Long projectId;
+                try {
+                    projectId = Long.parseLong(projectStr);
+                } catch (NumberFormatException e) {
+                    ProjectVo vo = projectMapper.getProjectByName(projectStr);
+                    if (vo == null || vo.getId() == null) {
+                        continue;
+                    }
+                    projectId = vo.getId();
+                }
                 IssueConditionVo issueVo = new IssueConditionVo();
-                issueVo.setProjectId(Long.parseLong(projectId));
+                issueVo.setProjectId(projectId);
                 List<Long> idList = issueMapper.searchIssueId(issueVo);
                 if (CollectionUtils.isNotEmpty(idList)) {
                     issueVo.setIdList(idList);
-- 
Gitee