状态回传接口测试

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>

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,6 +1136,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
 
         //所有下发发送完成，修改数据状态
         for (int i = 0; i < objects.size(); i++) {
+            if(objects.get(i).getBoolean("sendsanfzt123")){
                 Map<String, Object> updateMap = new HashMap<>();
                 updateMap.put("tableName",mainDb);
                 //updateMap.put("dataStatus", "Y");
@@ -1141,6 +1145,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
                 mdmModuleDao.updateMdmSTs(updateMap);
             }
         }
+    }
 
     private void saveMdmModuleSendLogEntity(Long mdmCode,String distributeId,String dataType,String remark,String dbname,String formmain_id, String target_app, String appId, String target_api,String apiID, String source_data, String option_type) throws Exception {
         MdmModuleSendLogEntity mdmModuleSendLogEntity = new MdmModuleSendLogEntity();

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){