Просмотр исходного кода

919 JFlow微服务集成完成补充提交2

LT32820A 2 месяцев назад
Родитель
Сommit
6b9633857e
22 измененных файлов с 20 добавлено и 12 удалено
  1. 19 0
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/client/AppManage/WorkFlowClient.java
  2. 1 6
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/AppmanageServiceImpl.java
  3. 0 6
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml
  4. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/Install/SQLScript/InitView_MySQL.sql
  5. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/Install/SQLScript/InitView_Ora.sql
  6. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/Install/SQLScript/InitView_PostgreSQL.sql
  7. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/JSLibData/CovertMoneyToDaXie.js
  8. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/MultilingualJS/WF_Todolist.js
  9. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/CCForm.xml
  10. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/DBUrl.xml
  11. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/Ens/AttrDesc.xml
  12. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/Ens/ConfigEns.xml
  13. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/Ens/EnsAppXml/GE.xml
  14. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/Ens/EnsAppXml/WF.xml
  15. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/EventList.xml
  16. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/MapExt.xml
  17. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/OneWorkCopy.xml
  18. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/SysDataType.xml
  19. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/XmlDB.xml
  20. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/lang/js/en-us.js
  21. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/lang/load.js
  22. 0 0
      jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/lang/xml/Public.xml

+ 19 - 0
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/client/AppManage/WorkFlowClient.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.client.AppManage;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Hashtable;
+
+@FeignClient(value = "jflow-cloud", configuration = FeignClientConfig.class)
+@Component
+public interface WorkFlowClient {
+
+    @PostMapping("/WF/API/startFlow")
+    void startFlow(@RequestParam("flowNo") String flowNo,
+                   @RequestParam("username") String username,
+                   @RequestBody Hashtable<String, String> hashtable);
+}

+ 1 - 6
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/AppmanageServiceImpl.java

@@ -664,12 +664,7 @@ public class AppmanageServiceImpl implements AppmanageService {
                 throw new RuntimeException("Failed to access field: " + field.getName(), e);
             }
         }
-//        直接系统调用
-//        Dev2Interface dev2Interface = new Dev2Interface();
-//        long workID = dev2Interface.Node_CreateBlankWork(flowNo, username);
-//        if (hashtable.size() > 0) {
-//            dev2Interface.Node_SendWork(flowNo, workID, hashtable);
-//        }
+
 
 //      微服务调用
         workFlowClient.startFlow(flowNo, username, hashtable);

+ 0 - 6
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml

@@ -37,12 +37,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jflow-core</artifactId>
-            <version>1.1.0</version>
-            <scope>compile</scope>
-        </dependency>
 
 <!--        <dependency>-->
 <!--            <groupId>cn.lttc</groupId>-->

+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/Install/SQLScript/InitView_MySQL.sql


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/Install/SQLScript/InitView_Ora.sql


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/Install/SQLScript/InitView_PostgreSQL.sql


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/JSLibData/CovertMoneyToDaXie.js


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/MultilingualJS/WF_Todolist.js


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/CCForm.xml


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/DBUrl.xml


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/Ens/AttrDesc.xml


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/Ens/ConfigEns.xml


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/Ens/EnsAppXml/GE.xml


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/Ens/EnsAppXml/WF.xml


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/EventList.xml


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/MapExt.xml


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/OneWorkCopy.xml


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/SysDataType.xml


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/XML/XmlDB.xml


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/lang/js/en-us.js


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/lang/load.js


+ 0 - 0
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/Data/lang/xml/Public.xml