java110 пре 4 година
родитељ
комит
be3e2df347

+ 13 - 0
java110-core/src/main/java/com/java110/core/event/cmd/ServiceCmdEventPublishing.java

@@ -1,6 +1,8 @@
 package com.java110.core.event.cmd;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.center.DataFlowListenerOrderComparator;
@@ -19,9 +21,11 @@ import com.java110.utils.log.LoggerEngine;
 import com.java110.utils.util.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.http.HttpMethod;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -199,6 +203,15 @@ public class ServiceCmdEventPublishing {
     @SuppressWarnings({"unchecked", "rawtypes"})
     protected static void invokeListener(ServiceCmdListener listener, CmdEvent event) {
         try {
+
+           Method method = listener.getClass().getDeclaredMethod("doCmd",CmdEvent.class, ICmdDataFlowContext.class, JSONObject.class);
+           Java110Transactional java110Transactional = AnnotationUtils.findAnnotation(method, Java110Transactional.class);
+           System.out.printf("123123");
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+        try {
+
             listener.cmd(event);
         } catch (CmdException e) {
             LoggerEngine.error("发布侦听失败", e);

+ 0 - 3
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java

@@ -164,9 +164,6 @@ public class QueryWorkFlowFirstStaffBMOImpl implements IQueryWorkFlowFirstStaffB
             Model modelData = repositoryService.getModel(workflowModelDto.getModelId());
             byte[] bpmnBytes = null;
             bpmnBytes = repositoryService.getModelEditorSource(workflowModelDto.getModelId());
-            String encoded = Base64Convert.byteToBase64(bpmnBytes);
-            byte[] decoded = Base64Convert.base64ToByte(encoded);
-            String xml = new String(decoded);
             String processName = modelData.getName() + ".bpmn20.xml";
             ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
             Deployment deployment = repositoryService.createDeployment().name(oaWorkflowDtos.get(0).getFlowName())

+ 2 - 0
service-dev/src/main/java/com/java110/dev/cmd/cache/FlushCacheCmd.java

@@ -2,6 +2,7 @@ package com.java110.dev.cmd.cache;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
@@ -31,6 +32,7 @@ public class FlushCacheCmd extends AbstractServiceCmdListener {
     }
 
     @Override
+    @Java110Transactional
     protected void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
         devServiceCacheSMOImpl.flush(reqJson.toJavaObject(Map.class));