优化代码

java110-bean/src/main/java/com/java110/dto/data/DatabusQueueDataDto.java

@@ -19,6 +19,8 @@ public class DatabusQueueDataDto implements Serializable {
         this.businesses = businesses;
     }
 
+    private String dataId;
+
     private String beanName;
 
     private Business business;
@@ -47,4 +49,12 @@ public class DatabusQueueDataDto implements Serializable {
     public void setBusinesses(List<Business> businesses) {
         this.businesses = businesses;
     }
+
+    public String getDataId() {
+        return dataId;
+    }
+
+    public void setDataId(String dataId) {
+        this.dataId = dataId;
+    }
 }

service-job/src/main/java/com/java110/job/databus/DatabusDataQueue.java

@@ -1,5 +1,6 @@
 package com.java110.job.databus;
 
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.log.LoggerFactory;
 import com.java110.dto.data.DatabusQueueDataDto;
 import org.slf4j.Logger;
@@ -20,10 +21,10 @@ public class DatabusDataQueue {
      */
     public static void addMsg(DatabusQueueDataDto databusQueueDataDto) throws Exception {
         msgs.offer(databusQueueDataDto, 3, TimeUnit.SECONDS);
+
     }
 
     public static DatabusQueueDataDto getData() throws Exception {
-
         return msgs.take();
 
     }

service-job/src/main/java/com/java110/job/smo/impl/DataBusInnerServiceSMOImpl.java

@@ -159,12 +159,15 @@ public class DataBusInnerServiceSMOImpl extends BaseServiceSMO implements IDataB
      * @return
      */
     @Override
-    public boolean  databusData(@RequestBody DatabusDataDto databusDataDto) {
+    public boolean databusData(@RequestBody DatabusDataDto databusDataDto) {
         // IDatabusAdapt databusAdaptImpl = null;
         List<BusinessDatabusDto> databusDtos = DatabusCache.getDatabuss();
         Business business = null;
         List<Business> businesses = null;
+        DatabusQueueDataDto databusQueueDataDto = null;
+        String dataId = "";
         for (BusinessDatabusDto databusDto : databusDtos) {
+            dataId = GenerateCodeFactory.getUUID();
             try {
                 if (!databusDataDto.getBusinessTypeCd().equals(databusDto.getBusinessTypeCd())) {
                     continue;
@@ -174,8 +177,11 @@ public class DataBusInnerServiceSMOImpl extends BaseServiceSMO implements IDataB
                 business.setData(databusDataDto.getData());
                 business.setBusinessTypeCd(databusDataDto.getBusinessTypeCd());
                 businesses.add(business);
+                databusQueueDataDto = new DatabusQueueDataDto(databusDto.getBeanName(), business, businesses);
+                databusQueueDataDto.setDataId(dataId);
+
                 //todo 存放队列中
-                DatabusDataQueue.addMsg(new DatabusQueueDataDto(databusDto.getBeanName(), business, businesses));
+                DatabusDataQueue.addMsg(databusQueueDataDto);
 
 //                databusAdaptImpl = ApplicationContextFactory.getBean(databusDto.getBeanName(), IDatabusAdapt.class);
 //                databusAdaptImpl.customExchange(customBusinessDatabusDto);