流程

hx-common/library-product/src/main/java/com/fjhx/service/impl/MaterialServiceImpl.java

@@ -35,13 +35,12 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
         Assert.notEmpty(material.getName(), "物料名称不能为空");
         Assert.notEmpty(material.getCode(), "物料编码不能为空");
 
-
         String tenantId = AuthUtil.getTenantId();
 
         // 保证每个租户物料编码唯一
         Boolean flag = redisLockClient.lockFair(LibraryProductLockConstant.MATERIAL_CODE_ONLY_LOCK + tenantId,
                 () -> {
-                    // 判断物料编码不是唯一的
+                    // 判断物料编码是否唯一
                     materialCodeOnly(tenantId, material.getCode(), null);
                     save(material);
                     return true;
@@ -57,7 +56,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
         // 保证每个租户物料编码唯一
         Boolean flag = redisLockClient.lockFair(LibraryProductLockConstant.MATERIAL_CODE_ONLY_LOCK + tenantId,
                 () -> {
-                    // 判断物料编码不是唯一的
+                    // 判断物料编码是否唯一
                     materialCodeOnly(tenantId, material.getCode(), material.getId());
                     updateById(material);
                     return true;

hx-common/pom.xml

@@ -40,6 +40,7 @@
     <dependencyManagement>
         <dependencies>
 
+            <!-- blade -->
             <dependency>
                 <groupId>org.springblade.platform</groupId>
                 <artifactId>blade-bom</artifactId>
@@ -132,5 +133,33 @@
         </dependencies>
     </dependencyManagement>
 
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.3.1.RELEASE</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 
 </project>

hx-service-api/service-flow-api/pom.xml

@@ -17,10 +17,12 @@
     </properties>
 
     <dependencies>
+
         <dependency>
             <groupId>com.fjhx</groupId>
             <artifactId>service-file-api</artifactId>
         </dependency>
+
     </dependencies>
 
 </project>

hx-service-api/service-flow-api/src/main/java/com/fjhx/utils/FlowConstructor.java

@@ -58,7 +58,9 @@ public class FlowConstructor {
         ExampleInfoEx exampleInfo = new ExampleInfoEx();
         exampleInfo.setProcessInfoId(flowInfo.getId());
         exampleInfo.setFlowLinkNo(flowLinkNo);
-        exampleInfo.setCacheData(JSONObject.toJSONString(exampleAbstract.cacheData));
+        if (ObjectUtil.isNotEmpty(exampleAbstract.cacheData)) {
+            exampleInfo.setCacheData(JSONObject.toJSONString(exampleAbstract.cacheData));
+        }
 
         ExampleDetails startExampleDetails = new ExampleDetails();
         startExampleDetails.setRemarks(remarks);
@@ -137,6 +139,14 @@ public class FlowConstructor {
 
         ExampleInfo exampleInfo = exampleInfoResult.getData();
 
+        // 获取流程缓存
+        exampleAbstract.cacheData = exampleInfo.getCacheData();
+
+        // 赋值新缓存
+        if (ObjectUtil.isNotEmpty(exampleAbstract.cacheData)) {
+            exampleInfo.setCacheData(JSONObject.toJSONString(exampleAbstract.cacheData));
+        }
+
         // 调用方法查看是否有指定跳转节点,没有则正常流转
         GetNodeButtonVo getNodeButtonVo = new GetNodeButtonVo();
         getNodeButtonVo.setProcessTenantId(exampleInfo.getProcessTenantId());
@@ -152,7 +162,6 @@ public class FlowConstructor {
         exampleInfo.setProcessNodeId(processNodeButton.getJumpNodeId());
         exampleInfo.setProcessNodeCode(processNodeButton.getProcessNodeCode());
 
-
         // 流程正常结束
         if (processNodeButton.getJumpNodeId().equals(FlowConstant.OVER_PROCESS_FLAG)) {
             exampleInfo.setComplete(StatusConstant.YES);
@@ -170,12 +179,14 @@ public class FlowConstructor {
             exampleInfo.setComplete(StatusConstant.No);
         }
 
+        // 流程明细
         ExampleDetails startExampleDetails = new ExampleDetails();
         startExampleDetails.setRemarks(remarks);
         startExampleDetails.setProcessNodeId(processNodeButton.getProcessNodeId());
         startExampleDetails.setProcessNodeButtonId(processNodeButton.getId());
         startExampleDetails.setNameType(processNodeButton.getNameType());
 
+        // 创建vo
         ExampleInfoEx exampleInfoEx = BeanUtil.toBean(exampleInfo, ExampleInfoEx.class);
         exampleInfoEx.setExampleDetails(startExampleDetails);
 

hx-service/pom.xml

@@ -144,13 +144,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

hx-service/storage-restructure/src/main/java/com/fjhx/controller/common/CommonFileController.java

@@ -44,21 +44,23 @@ public class CommonFileController {
     }
 
 
-    private final ExampleAbstract exampleAbstract = new ExampleAbstract() {
-
-        @Override
-        public String getCode() {
-            return "test";
-        }
-
-        @Override
-        public void end() {
-            ExampleInfo cacheData = getCacheData(ExampleInfo.class);
-            System.err.println("缓存     " + cacheData);
-            System.err.println("流程结束了");
-        }
-
-    };
+    private ExampleAbstract exampleAbstract() {
+        return new ExampleAbstract() {
+
+            @Override
+            public String getCode() {
+                return "test";
+            }
+
+            @Override
+            public void end() {
+                ExampleInfo cacheData = getCacheData(ExampleInfo.class);
+                System.err.println("缓存     " + cacheData);
+                System.err.println("流程结束了");
+            }
+
+        };
+    }
 
 
     @GetMapping("test")
@@ -67,16 +69,19 @@ public class CommonFileController {
         HashMap<String, String> map = new HashMap<>();
         map.put("processInfoId", "1111111111111111111111");
         map.put("processTenantId", "222222222222222222222");
-        exampleAbstract.setCacheData(map);
 
-        FlowConstructor.init(exampleAbstract).create(123456L, "测试发起流程");
+        ExampleAbstract exampleAbstract = exampleAbstract();
 
+        exampleAbstract.setCacheData(map);
+        FlowConstructor.init(exampleAbstract).create(123456L, "测试发起流程");
         return R.success();
     }
 
 
     @GetMapping("jump")
     public R jump() {
+
+        ExampleAbstract exampleAbstract = exampleAbstract();
         FlowConstructor.init(exampleAbstract).jump(123456L, 1560105451033104390L, "测试流程运行");
 
         return R.success();