From 4a3b47d6d5035814b6f9bc09eefa0966d60798df Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Wed, 13 Nov 2024 08:37:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=9B=9E=E4=BC=A0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildpackage/pom.xml                            |  6 ++++++
 .../plugin/MdmModulePluginInitializer.java      | 17 +++++++++++------
 .../service/impl/EncapsulationImpl.java         |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/buildpackage/pom.xml b/buildpackage/pom.xml
index ba8c1c4d..ad5f4e4b 100644
--- a/buildpackage/pom.xml
+++ b/buildpackage/pom.xml
@@ -111,6 +111,12 @@
                 <profile.active>dongj</profile.active>
             </properties>
         </profile>
+        <profile>
+            <id>llg</id> <!--越城区-->
+            <properties>
+                <profile.active>llg</profile.active>
+            </properties>
+        </profile>
     </profiles>
     <build>
         <finalName>kangarooDataCenterV3</finalName>
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
index 411215ea..beb4c48e 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
@@ -992,6 +992,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
                 mdmModuleSendLogEntity.setTableName(mainDb+"_send_log");
                 mdmModuleSendLogEntity.setFormmainId(doObjects.get(i).getString("id"));
                 mdmModuleSendLogEntity.setSts("Y");
+                mdmModuleSendLogEntity.setDataType("1");
                 mdmModuleSendLogEntity.setAppId(sysApplicationEntity.getId());
                 mdmModuleSendLogEntity.setApiId(apiEntity.getId());
                 //mdmModuleSendLogEntity.setDistributeId(mdmModuleDistributeEntities.get(i1).getId());
@@ -1122,10 +1123,12 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
                     }
                     //保存日志
                     saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"1","发送成功",mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1");
+                    objects.get(i).put("sendsanfzt123",true);
                     continue;
                 }else {
                     //保存日志
                     saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","转发失败:"+jsonResultEntity.getAttribute(),mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1");
+                    objects.get(i).put("sendsanfzt123",false);
                     continue;
                 }
             }
@@ -1133,12 +1136,14 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
 
         //所有下发发送完成，修改数据状态
         for (int i = 0; i < objects.size(); i++) {
-            Map<String, Object> updateMap = new HashMap<>();
-            updateMap.put("tableName",mainDb);
-            //updateMap.put("dataStatus", "Y");
-            updateMap.put("addStatus", "1");
-            updateMap.put("id", objects.get(i).getString("id"));
-            mdmModuleDao.updateMdmSTs(updateMap);
+            if(objects.get(i).getBoolean("sendsanfzt123")){
+                Map<String, Object> updateMap = new HashMap<>();
+                updateMap.put("tableName",mainDb);
+                //updateMap.put("dataStatus", "Y");
+                updateMap.put("addStatus", "1");
+                updateMap.put("id", objects.get(i).getString("id"));
+                mdmModuleDao.updateMdmSTs(updateMap);
+            }
         }
     }
 
diff --git a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java
index 8023f6ec..87fd8fb4 100644
--- a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java
+++ b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java
@@ -1435,7 +1435,7 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
         List<EncapsulationEntity> encapsulationEntities = encapsulationDao.queryCgrkddh(encapsulationEntity);
         //List<EncapsulationEntity> encapsulationEntities = new ArrayList<>();
         //EncapsulationEntity encapsulationEntity1 = new EncapsulationEntity();
-        //encapsulationEntity1.setCode("WW2411080010");
+        //encapsulationEntity1.setCode("WW2411110007");
         //encapsulationEntity1.setUnitcode("001");
         //encapsulationEntities.add(encapsulationEntity1);
         if(encapsulationEntities == null || encapsulationEntities.size() != 1){