代码优化

hx-area/pom.xml

@@ -9,7 +9,9 @@
         <version>3.8.5</version>
     </parent>
 
+    <groupId>com.fjhx</groupId>
     <artifactId>hx-area</artifactId>
+    <version>1.0.3</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -18,11 +20,13 @@
     </properties>
 
     <dependencies>
+
         <!-- 核心模块-->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-framework</artifactId>
         </dependency>
+
     </dependencies>
 
 </project>

hx-base/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.fjhx</groupId>
     <artifactId>hx-base</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -34,30 +34,15 @@
         </dependency>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>hx-socket</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>com.fjhx</groupId>
             <artifactId>hx-file</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>com.fjhx</groupId>
             <artifactId>hx-tenant</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>hx-area</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>hx-flow</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>

hx-file/pom.xml

@@ -9,7 +9,9 @@
         <version>3.8.5</version>
     </parent>
 
+    <groupId>com.fjhx</groupId>
     <artifactId>hx-file</artifactId>
+    <version>1.0.3</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

hx-flow/pom.xml

@@ -9,7 +9,9 @@
         <version>3.8.5</version>
     </parent>
 
+    <groupId>com.fjhx</groupId>
     <artifactId>hx-flow</artifactId>
+    <version>1.0.3</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -26,7 +28,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>com.fjhx</groupId>
             <artifactId>hx-file</artifactId>
         </dependency>
 
@@ -37,11 +39,6 @@
             <version>5.3.3</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>hx-socket</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>

hx-flow/src/main/java/com/fjhx/flow/service/flow/FlowExampleService.java

@@ -67,7 +67,6 @@ public interface FlowExampleService extends BaseService<FlowExample> {
      */
     void setStartData(SetStartDataDto dto);
 
-
     /**
      * 赋值流程id
      */

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowExampleServiceImpl.java

@@ -256,7 +256,7 @@ public class FlowExampleServiceImpl extends ServiceImpl<FlowExampleMapper, FlowE
 
         if (FlowStatusEnum.PASS.getKey().equals(status)
                 || FlowStatusEnum.REJECT.getKey().equals(status)
-                || !Objects.equals(flowExample.getHandleUserId(), SecurityUtils.getUserId())) {
+                || ObjectUtil.notEqual(flowExample.getHandleUserId(), SecurityUtils.getUserId())) {
             return buttonInfoList;
         }
 

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowProcessServiceImpl.java

@@ -20,8 +20,6 @@ import com.fjhx.flow.enums.HandleObjectTypeEnum;
 import com.fjhx.flow.enums.HandleTypeEnum;
 import com.fjhx.flow.enums.NodeTypeEnum;
 import com.fjhx.flow.service.flow.*;
-import com.fjhx.socket.core.PushTypeEnum;
-import com.fjhx.socket.core.WebSocketPush;
 import com.googlecode.aviator.AviatorEvaluator;
 import com.googlecode.aviator.Expression;
 import com.ruoyi.common.constant.StatusConstant;
@@ -193,7 +191,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
         ObsFileUtil.saveFile(dto.getFileList(), startExampleDetail.getId());
 
         // 推送
-        pushInitiateMessage(flowId, flowDefinition, nextNodeType, flowExample);
+        // pushInitiateMessage(flowId, flowDefinition, nextNodeType, flowExample);
 
         // 清空ThreadLocal
         FlowThreadLocalUtil.remove();
@@ -269,7 +267,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
         editExample(context);
 
         // 消息推送
-        pushJumpMessage(context);
+//        pushJumpMessage(context);
 
         // 清空ThreadLocal
         FlowThreadLocalUtil.remove();
@@ -606,7 +604,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
 
         // 如果不为分支
         else {
-            if (nextNodeList == null || nextNodeList.size() == 0) {
+            if (nextNodeList == null || nextNodeList.isEmpty()) {
                 throw new ServiceException("流程定义错误：用户节点未找到跳转节点");
             }
             if (nextNodeList.size() > 1) {
@@ -678,7 +676,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
 
             case POST:
                 List<SysUser> postUserList = sysUserService.getListByPostId(handleObjectId);
-                if (postUserList.size() == 0) {
+                if (postUserList.isEmpty()) {
                     throw new ServiceException("流程节点处理人异常：节点处理岗位无用户");
                 }
                 if (postUserList.size() == 1) {
@@ -692,7 +690,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
 
             case ROLE:
                 List<SysUser> roleUserList = sysUserService.getListByRoleId(handleObjectId);
-                if (roleUserList.size() == 0) {
+                if (roleUserList.isEmpty()) {
                     throw new ServiceException("流程节点处理人异常：节点处理角色无用户");
                 }
                 if (roleUserList.size() == 1) {
@@ -731,7 +729,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
             title = "您有一条新的待审批事项，请及时处理。";
         }
 
-        WebSocketPush.byUser(PushTypeEnum.MESSAGE, pushUserId, title, 0, businessData);
+        // WebSocketPush.byUser(PushTypeEnum.MESSAGE, pushUserId, title, 0, businessData);
     }
 
     /**
@@ -816,7 +814,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
                 throw new ServiceException("未知流程跳转类型");
         }
 
-        WebSocketPush.byUser(PushTypeEnum.MESSAGE, pushUserId, title, 0, businessData);
+        // WebSocketPush.byUser(PushTypeEnum.MESSAGE, pushUserId, title, 0, businessData);
     }
 
     // public static void main(String[] args) {

hx-kd100/pom.xml

@@ -9,7 +9,9 @@
         <version>3.8.5</version>
     </parent>
 
+    <groupId>com.fjhx</groupId>
     <artifactId>hx-kd100</artifactId>
+    <version>1.0.3</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

hx-socket/pom.xml

@@ -9,7 +9,9 @@
         <version>3.8.5</version>
     </parent>
 
+    <groupId>com.fjhx</groupId>
     <artifactId>hx-socket</artifactId>
+    <version>1.0.3</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

hx-tenant/pom.xml

@@ -9,7 +9,9 @@
         <version>3.8.5</version>
     </parent>
 
+    <groupId>com.fjhx</groupId>
     <artifactId>hx-tenant</artifactId>
+    <version>1.0.3</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -18,14 +20,17 @@
     </properties>
 
     <dependencies>
+
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-framework</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>com.fjhx</groupId>
             <artifactId>hx-file</artifactId>
         </dependency>
+
     </dependencies>
 
 </project>

pom.xml

@@ -9,6 +9,7 @@
     <version>3.8.5</version>
 
     <properties>
+        <hx.version>1.0.3</hx.version>
         <ruoyi.version>3.8.5</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -157,39 +158,39 @@
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>com.fjhx</groupId>
                 <artifactId>hx-socket</artifactId>
-                <version>${ruoyi.version}</version>
+                <version>${hx.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>com.fjhx</groupId>
                 <artifactId>hx-file</artifactId>
-                <version>${ruoyi.version}</version>
+                <version>${hx.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>com.fjhx</groupId>
                 <artifactId>hx-tenant</artifactId>
-                <version>${ruoyi.version}</version>
+                <version>${hx.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>com.fjhx</groupId>
                 <artifactId>hx-area</artifactId>
-                <version>${ruoyi.version}</version>
+                <version>${hx.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>com.fjhx</groupId>
                 <artifactId>hx-flow</artifactId>
-                <version>${ruoyi.version}</version>
+                <version>${hx.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.fjhx</groupId>
                 <artifactId>hx-base</artifactId>
-                <version>1.0.2</version>
+                <version>${hx.version}</version>
             </dependency>
 
         </dependencies>