From afdc003aa2c6f7bf9018d4ad552c7f2648bc652f Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 8 Sep 2022 18:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E8=B7=91=E9=A1=B9=E7=9B=AE=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=81=87=E5=A6=82=E5=BD=92?=
 =?UTF-8?q?=E6=A1=A3A=E6=A0=87=E5=87=86=EF=BC=8C=E5=86=8D=E8=B7=91?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=EF=BC=8C?=
 =?UTF-8?q?=E5=81=87=E5=A6=82=E5=BD=92=E6=A1=A3B=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E7=9C=8B=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E5=BA=94=E9=A1=B9=E7=9B=AE=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?A=E6=A0=87=E5=87=86=E8=A2=AB=E6=9B=BF=E6=8D=A2=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/FeignClient/workFlowFeignClient.java    |  4 ++--
 .../dao/SarStandProjectLibraryDao.java                 |  3 +++
 .../impl/SarStandProjectLibraryServiceImpl.java        |  8 +++++++-
 .../SarStandProjectLibraryMapper.xml                   | 10 ++++++++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
index 581dd4d9..ff88272a 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
@@ -18,8 +18,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-@FeignClient(value = "bat-wkflow-test")
-//@FeignClient(value = "bat-wkflow")
+//@FeignClient(value = "bat-wkflow-test")
+@FeignClient(value = "bat-wkflow")
 //@FeignClient(value = "shan6")
 public interface workFlowFeignClient {
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
index 70c7df9a..034aa33e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
@@ -31,8 +31,11 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
         List<String> getAllStand();
         void updateByProjectId(@Param("id")String id, @Param("version")String version);
         List<SarStandProjectLibrary> updateByProjectIdBath(@Param("id")List<String> id, @Param("version")String version);
+
         void deleteByProjectId(@Param("projectId")String projectId);
 
+        void deleteByProjectIdAndStandId(@Param("projectId")String projectId,@Param("standId")String standId);
+
         List<String> selectListByids(@Param("ids") List<String> ids);
         List<SarStandProjectLibrary> queryProjectGroup(@Param("current")int current,@Param("size")int size,@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
         Integer queryProjectGroupCount(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
index 99a64b24..26ecbf36 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.mysql.cj.x.protobuf.MysqlxDatatypes;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -138,6 +139,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
 
     @Override
     public IPage<SarStandProjectLibrary> queryProjectGroup(int current,int size,SarStandProjectLibrary sarStandProjectLibrary) {
+        size = 10000;
         List<SarStandProjectLibrary> sarStandProjectLibraries=sarStandProjectLibraryDao.queryProjectGroup(current,size,sarStandProjectLibrary);
         Integer total=sarStandProjectLibraryDao.queryProjectGroupCount(sarStandProjectLibrary);
         Page<SarStandProjectLibrary> page=new Page<>();
@@ -599,7 +601,11 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             StandProjectRelationDto standProjectRelationDto = list.get(0);
             if(standProjectRelationDto!=null && StringUtils.isNotBlank(standProjectRelationDto.getProjectId())){
                 sarStandProjectLibraryDao.updateFlag(standProjectRelationDto.getProjectId());
-                sarStandProjectLibraryDao.deleteByProjectId(standProjectRelationDto.getProjectId());
+            }
+            for (StandProjectRelationDto relationDto : list){
+                if (StringUtils.isNotBlank(relationDto.getStandId())) {
+                    sarStandProjectLibraryDao.deleteByProjectIdAndStandId(relationDto.getProjectId(), relationDto.getStandId());
+                }
             }
             sarStandProjectLibraryDao.batchInsert(list);
             if(standProjectRelationDto!=null && StringUtils.isNotBlank(standProjectRelationDto.getProjectId())){
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
index 6458713f..53bdc979 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
@@ -32,6 +32,12 @@
              project_id= #{projectId}
     </delete>
 
+    <delete id="deleteByProjectIdAndStandId">
+        delete from sar_stand_project_relation where
+             project_id= #{projectId}
+             and stand_id = #{standId}
+    </delete>
+
     <update id="updateByProjectId">
         update sar_stand_project_library
         <if test="id != null">
@@ -420,8 +426,8 @@
     </select>
     <select id="queryProjectGroup"
             resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
-        select distinct sar_stand_project_library.project_group,ANY_VALUE(sar_stand_project_library.management_host_name),
-        ANY_VALUE(sar_stand_project_library.category_name),ANY_VALUE(sar_stand_project_library.development_host_name)
+        select distinct sar_stand_project_library.project_group,ANY_VALUE(sar_stand_project_library.management_host_name) as management_host_name,
+        ANY_VALUE(sar_stand_project_library.category_name) as category_name,ANY_VALUE(sar_stand_project_library.development_host_name) as development_host_name
         from sar_stand_project_library
         where 1=1
         <if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">