processFlow迁移

hzims-biz-common/src/main/java/com/hnac/hzims/common/to/process/ProcessWorkFlowResponse.java

@@ -1,4 +1,4 @@
-package com.hnac.hzims.vo.process;
+package com.hnac.hzims.common.to.process;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

hzims-model/pom.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.hnac.hzims</groupId>
-        <artifactId>hzims-back</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>hzims-model</artifactId>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-swagger</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                    <finalName>${project.name}</finalName>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

hzims-service-api/hzims-operational-api/pom.xml

@@ -65,6 +65,10 @@
             <version>4.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>hzims-biz-common</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/MaintenanceFeignClient.java

@@ -1,8 +1,8 @@
 package com.hnac.hzims.operational.maintenance.feign;
 
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import com.hnac.hzims.operational.OperationalConstants;
 import com.hnac.hzims.operational.maintenance.feign.fallback.MaintenanceFeignClientFallback;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Repository;

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/fallback/MaintenanceFeignClientFallback.java

@@ -1,7 +1,7 @@
 package com.hnac.hzims.operational.maintenance.feign.fallback;
 
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import com.hnac.hzims.operational.maintenance.feign.MaintenanceFeignClient;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 import org.springframework.stereotype.Component;
 
 /**

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/fallback/OperationTicketFeignClientFallback.java

@@ -0,0 +1,27 @@
+package com.hnac.hzims.ticket.ticketprocess.fallback;
+
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.ticket.ticketprocess.feign.OperationTicketFeignClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/6/15 11:41
+ */
+@Slf4j
+@Component
+public class OperationTicketFeignClientFallback  implements OperationTicketFeignClient {
+    /**
+     * 操作票待处理
+     *
+     * @param response
+     */
+    @Override
+    public Boolean findPending(ProcessWorkFlowResponse response) {
+         log.error("操作票流程出现异常呢");
+        return false;
+    }
+}

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/fallback/TicketProcessFeignClientFallback.java

@@ -0,0 +1,27 @@
+package com.hnac.hzims.ticket.ticketprocess.fallback;
+
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.ticket.ticketprocess.feign.TicketProcessFeignClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/6/15 11:44
+ */
+@Slf4j
+@Component
+public class TicketProcessFeignClientFallback implements TicketProcessFeignClient {
+    /**
+     * 工作票待处理
+     *
+     * @param response
+     */
+    @Override
+    public Boolean findPending(ProcessWorkFlowResponse response) {
+        log.error("工作票出现异常呢");
+        return false;
+    }
+}

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/feign/OperationTicketFeignClient.java

@@ -0,0 +1,34 @@
+package com.hnac.hzims.ticket.ticketprocess.feign;
+
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.ticket.constants.TicketConstants;
+import com.hnac.hzims.ticket.ticketprocess.fallback.OperationTicketFeignClientFallback;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/6/15 11:39
+ */
+@FeignClient(
+        value = TicketConstants.APP_NAME,
+        fallback = OperationTicketFeignClientFallback.class
+)
+public interface OperationTicketFeignClient {
+
+
+    /**
+     * 操作票待处理
+     * @param response
+     */
+    @PostMapping("/operation-ticket/findPending")
+    @ApiOperation(value = "操作票待处理")
+    public Boolean findPending(@RequestBody ProcessWorkFlowResponse response);
+
+
+
+}

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/feign/TicketProcessFeignClient.java

@@ -0,0 +1,33 @@
+package com.hnac.hzims.ticket.ticketprocess.feign;
+
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.ticket.constants.TicketConstants;
+import com.hnac.hzims.ticket.ticketprocess.fallback.TicketProcessFeignClientFallback;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/6/15 11:35
+ */
+@FeignClient(
+        value = TicketConstants.APP_NAME,
+        fallback = TicketProcessFeignClientFallback.class
+)
+public interface TicketProcessFeignClient {
+
+
+    /**
+     * 工作票待处理
+     *
+     * @param response
+     */
+    @PostMapping("/ticket-process/findPending")
+    @ApiOperation(value = "工作票待处理")
+    public Boolean findPending(@RequestBody ProcessWorkFlowResponse response);
+
+}

hzims-service/hzims-middle/pom.xml

@@ -66,6 +66,20 @@
             <artifactId>swagger-bootstrap-ui</artifactId>
             <version>${swagger-bootstrap-ui.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>hzims-operational-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>hzims-model</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>ticket-api</artifactId>
+        </dependency>
 
     </dependencies>
 

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/CodeGenerator.java

@@ -1,4 +1,4 @@
-// package com.hnac.hzims.ticket.processflow;
+package com.hnac.hzims.middle.processflow;// package com.hnac.hzims.ticket.processflow;
 //
 // import com.baomidou.mybatisplus.generator.AutoGenerator;
 // import com.baomidou.mybatisplus.generator.InjectionConfig;

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/constant/TicketProcessConstant.java

@@ -1,4 +1,4 @@
-package com.hnac.hzims.ticket.processflow.constant;
+package com.hnac.hzims.middle.processflow.constant;
 
 /**
  * 开票常量类

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/consumer/StandardWorkTicketConsumer.java

@@ -1,12 +1,12 @@
-package com.hnac.hzims.ticket.processflow.consumer;
+package com.hnac.hzims.middle.processflow.consumer;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.hnac.hzims.ticket.processflow.entity.WorkflowOperationLog;
+import com.hnac.hzims.middle.processflow.entity.WorkflowOperationLog;
-import com.hnac.hzims.ticket.processflow.service.WorkflowOperationLogService;
+import com.hnac.hzims.middle.processflow.service.WorkflowOperationLogService;
-import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
+import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
-import com.hnac.hzims.ticket.processflow.strategy.service.ProcessService;
+import com.hnac.hzims.middle.processflow.strategy.service.ProcessService;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.queue.annotation.RedisQueue;
 import org.springblade.queue.consume.IQueueConsume;

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/ProcessDictController.java

@@ -1,9 +1,10 @@
-package com.hnac.hzims.ticket.processflow.controller;
+package com.hnac.hzims.middle.processflow.controller;
 
-import com.hnac.hzims.ticket.processflow.entity.ProcessDict;
+
-import com.hnac.hzims.ticket.processflow.service.ProcessDictService;
+import com.hnac.hzims.middle.processflow.entity.ProcessDict;
-import groovy.util.logging.Slf4j;
+import com.hnac.hzims.middle.processflow.service.ProcessDictService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/ProcessTypeController.java

@@ -1,17 +1,17 @@
-package com.hnac.hzims.ticket.processflow.controller;
+package com.hnac.hzims.middle.processflow.controller;
 
 
 import com.alibaba.fastjson.JSON;
 import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
 import com.hnac.hzims.common.logs.enums.BusinessType;
 import com.hnac.hzims.common.logs.enums.OperatorType;
-import com.hnac.hzims.ticket.processflow.entity.ProcessType;
+import com.hnac.hzims.middle.processflow.entity.ProcessType;
-import com.hnac.hzims.ticket.processflow.properties.TicketProperties;
+import com.hnac.hzims.middle.processflow.properties.TicketProperties;
-import com.hnac.hzims.ticket.processflow.properties.WorkTicketProperties;
+import com.hnac.hzims.middle.processflow.properties.WorkTicketProperties;
-import com.hnac.hzims.ticket.processflow.service.ProcessTypeService;
+import com.hnac.hzims.middle.processflow.service.ProcessTypeService;
-import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
+import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
-import com.hnac.hzims.ticket.processflow.strategy.service.ProcessService;
+import com.hnac.hzims.middle.processflow.strategy.service.ProcessService;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.jackson.JsonUtil;

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/WorkflowOperationLogController.java

@@ -1,4 +1,4 @@
-package com.hnac.hzims.ticket.processflow.controller;
+package com.hnac.hzims.middle.processflow.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/entity/ProcessDict.java

@@ -1,4 +1,4 @@
-package com.hnac.hzims.ticket.processflow.entity;
+package com.hnac.hzims.middle.processflow.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/entity/ProcessType.java

@@ -1,4 +1,4 @@
-package com.hnac.hzims.ticket.processflow.entity;
+package com.hnac.hzims.middle.processflow.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/entity/WorkflowOperationLog.java

@@ -1,4 +1,4 @@
-package com.hnac.hzims.ticket.processflow.entity;
+package com.hnac.hzims.middle.processflow.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 
@@ -60,8 +60,18 @@ public class WorkflowOperationLog implements Serializable {
     /**
      * 表单
      */
-    @TableField("form_data")
+    @TableField("variables")
-    private String formData;
+    private String variables;
+
+
+
+    /**
+     * 用户Id
+     */
+    @TableField("variables")
+    private String userId;
+
+
 
     /**
      * 创建时间

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/mapper/ProcessDictMapper.java

@@ -1,6 +1,6 @@
-package com.hnac.hzims.ticket.processflow.mapper;
+package com.hnac.hzims.middle.processflow.mapper;
 
-import com.hnac.hzims.ticket.processflow.entity.ProcessDict;
+import com.hnac.hzims.middle.processflow.entity.ProcessDict;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
 /**

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/mapper/ProcessTypeMapper.java

@@ -1,7 +1,7 @@
-package com.hnac.hzims.ticket.processflow.mapper;
+package com.hnac.hzims.middle.processflow.mapper;
 
-import com.hnac.hzims.ticket.processflow.entity.ProcessType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzims.middle.processflow.entity.ProcessType;
 
 /**
  * <p>

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/mapper/WorkflowOperationLogMapper.java

@@ -1,7 +1,7 @@
-package com.hnac.hzims.ticket.processflow.mapper;
+package com.hnac.hzims.middle.processflow.mapper;
 
-import com.hnac.hzims.ticket.processflow.entity.WorkflowOperationLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzims.middle.processflow.entity.WorkflowOperationLog;
 
 /**
  * <p>

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/properties/TicketProperties.java

@@ -1,4 +1,4 @@
-package com.hnac.hzims.ticket.processflow.properties;
+package com.hnac.hzims.middle.processflow.properties;
 
 
 import lombok.Data;

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/properties/WorkTicketProperties.java

@@ -1,4 +1,4 @@
-package com.hnac.hzims.ticket.processflow.properties;
+package com.hnac.hzims.middle.processflow.properties;
 
 import lombok.Data;
 import lombok.Getter;

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/ProcessDictService.java

@@ -1,7 +1,7 @@
-package com.hnac.hzims.ticket.processflow.service;
+package com.hnac.hzims.middle.processflow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hnac.hzims.ticket.processflow.entity.ProcessDict;
+import com.hnac.hzims.middle.processflow.entity.ProcessDict;
 
 /**
  * @Author WL

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/ProcessTypeService.java

@@ -1,7 +1,7 @@
-package com.hnac.hzims.ticket.processflow.service;
+package com.hnac.hzims.middle.processflow.service;
 
-import com.hnac.hzims.ticket.processflow.entity.ProcessType;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hnac.hzims.middle.processflow.entity.ProcessType;
 
 /**
  * <p>

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/WorkflowOperationLogService.java

@@ -1,7 +1,7 @@
-package com.hnac.hzims.ticket.processflow.service;
+package com.hnac.hzims.middle.processflow.service;
 
-import com.hnac.hzims.ticket.processflow.entity.WorkflowOperationLog;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hnac.hzims.middle.processflow.entity.WorkflowOperationLog;
 
 /**
  * <p>

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/impl/ProcessDictServiceImpl.java

@@ -1,12 +1,12 @@
-package com.hnac.hzims.ticket.processflow.service.impl;
+package com.hnac.hzims.middle.processflow.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hnac.hzims.ticket.processflow.entity.ProcessDict;
+import com.hnac.hzims.middle.processflow.entity.ProcessDict;
-import com.hnac.hzims.ticket.processflow.mapper.ProcessDictMapper;
+import com.hnac.hzims.middle.processflow.mapper.ProcessDictMapper;
-import com.hnac.hzims.ticket.processflow.service.ProcessDictService;
+import com.hnac.hzims.middle.processflow.service.ProcessDictService;
-import groovy.util.logging.Slf4j;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/impl/ProcessTypeServiceImpl.java

@@ -1,8 +1,8 @@
-package com.hnac.hzims.ticket.processflow.service.impl;
+package com.hnac.hzims.middle.processflow.service.impl;
 
-import com.hnac.hzims.ticket.processflow.entity.ProcessType;
+import com.hnac.hzims.middle.processflow.entity.ProcessType;
-import com.hnac.hzims.ticket.processflow.mapper.ProcessTypeMapper;
+import com.hnac.hzims.middle.processflow.mapper.ProcessTypeMapper;
-import com.hnac.hzims.ticket.processflow.service.ProcessTypeService;
+import com.hnac.hzims.middle.processflow.service.ProcessTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/impl/WorkflowOperationLogServiceImpl.java

@@ -1,9 +1,9 @@
-package com.hnac.hzims.ticket.processflow.service.impl;
+package com.hnac.hzims.middle.processflow.service.impl;
 
-import com.hnac.hzims.ticket.processflow.entity.WorkflowOperationLog;
-import com.hnac.hzims.ticket.processflow.mapper.WorkflowOperationLogMapper;
-import com.hnac.hzims.ticket.processflow.service.WorkflowOperationLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hnac.hzims.middle.processflow.entity.WorkflowOperationLog;
+import com.hnac.hzims.middle.processflow.mapper.WorkflowOperationLogMapper;
+import com.hnac.hzims.middle.processflow.service.WorkflowOperationLogService;
 import org.springframework.stereotype.Service;
 
 /**

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/abstracts/ProcessAbstractService.java

@@ -1,8 +1,8 @@
-package com.hnac.hzims.ticket.processflow.strategy.abstracts;
+package com.hnac.hzims.middle.processflow.strategy.abstracts;
 
-import com.hnac.hzims.ticket.processflow.entity.ProcessType;
+import com.hnac.hzims.middle.processflow.entity.ProcessType;
-import com.hnac.hzims.ticket.processflow.service.ProcessTypeService;
+import com.hnac.hzims.middle.processflow.service.ProcessTypeService;
-import com.hnac.hzims.ticket.processflow.strategy.service.ProcessService;
+import com.hnac.hzims.middle.processflow.strategy.service.ProcessService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/core/ProcessIdWorker.java

@@ -1,4 +1,4 @@
-package com.hnac.hzims.ticket.processflow.strategy.core;
+package com.hnac.hzims.middle.processflow.strategy.core;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/entity/WorkflowQueue.java

@@ -1,4 +1,4 @@
-package com.hnac.hzims.ticket.processflow.strategy.entity;
+package com.hnac.hzims.middle.processflow.strategy.entity;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/service/ProcessService.java

@@ -1,7 +1,7 @@
-package com.hnac.hzims.ticket.processflow.strategy.service;
+package com.hnac.hzims.middle.processflow.strategy.service;
 
-import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
+import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 
 /**
  * @Author dfy

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java

@@ -1,15 +1,17 @@
-package com.hnac.hzims.ticket.processflow.strategy.serviceimpl;
+package com.hnac.hzims.middle.processflow.strategy.serviceimpl;
 
-import com.hnac.hzims.ticket.processflow.service.ProcessDictService;
+import com.hnac.hzims.middle.processflow.service.ProcessDictService;
-import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService;
+import com.hnac.hzims.middle.processflow.strategy.abstracts.ProcessAbstractService;
-import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
+import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
-import com.hnac.hzims.ticket.twoTicket.service.TicketProcessService;
+import com.hnac.hzims.ticket.ticketprocess.feign.OperationTicketFeignClient;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.exception.ServiceException;
 import org.springframework.stereotype.Service;
 
-import static com.hnac.hzims.ticket.processflow.constant.TicketProcessConstant.MACHINERY_TICKET_KEY;
+import static com.hnac.hzims.middle.processflow.constant.TicketProcessConstant.MACHINERY_TICKET_KEY;
+
 
 /**
  * 水力机械工作票实现类
@@ -26,7 +28,7 @@ public class MachineryTicketProcessServiceImpl extends ProcessAbstractService {
 
 
 
-	private  final TicketProcessService ticketProcessService;
+	private  final OperationTicketFeignClient ticketProcessService;
 
 
 
@@ -63,6 +65,10 @@ public class MachineryTicketProcessServiceImpl extends ProcessAbstractService {
 	 */
 	@Override
 	public void calculate(ProcessWorkFlowResponse response) {
-		ticketProcessService.findPending(response);
+		Boolean pending = ticketProcessService.findPending(response);
+		if (!pending) {
+			throw  new ServiceException("水力机械工作票流程出现异常呢");
+
+		}
 	}
 }

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/MaintenanceProcessServiceImpl.java

@@ -1,16 +1,18 @@
-package com.hnac.hzims.ticket.processflow.strategy.serviceimpl;
+package com.hnac.hzims.middle.processflow.strategy.serviceimpl;
 
+
+import com.hnac.hzims.middle.processflow.service.ProcessDictService;
+import com.hnac.hzims.middle.processflow.strategy.abstracts.ProcessAbstractService;
+import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
 import com.hnac.hzims.operational.maintenance.feign.MaintenanceFeignClient;
-import com.hnac.hzims.ticket.processflow.service.ProcessDictService;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
-import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService;
-import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;
 import org.springframework.stereotype.Service;
 
-import static com.hnac.hzims.ticket.processflow.constant.TicketProcessConstant.MAINTENANCE_KEY;
+import static com.hnac.hzims.middle.processflow.constant.TicketProcessConstant.MAINTENANCE_KEY;
+
 
 /**
  * 日常维护实现类

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java

@@ -1,18 +1,21 @@
-package com.hnac.hzims.ticket.processflow.strategy.serviceimpl;
+package com.hnac.hzims.middle.processflow.strategy.serviceimpl;
 
-import com.hnac.hzims.ticket.processflow.service.ProcessDictService;
+
-import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService;
+import com.hnac.hzims.middle.processflow.service.ProcessDictService;
-import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
+import com.hnac.hzims.middle.processflow.strategy.abstracts.ProcessAbstractService;
-import com.hnac.hzims.ticket.twoTicket.service.TicketProcessService;
+import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.ticket.ticketprocess.feign.TicketProcessFeignClient;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.exception.ServiceException;
 import org.springframework.stereotype.Service;
 
-import static com.hnac.hzims.ticket.processflow.constant.TicketProcessConstant.FIRST_TICKET_KEY;
+import static com.hnac.hzims.middle.processflow.constant.TicketProcessConstant.FIRST_TICKET_KEY;
+
 
 /**
- * 开工作票流程实现类
+ * 工作票流程实现类
  *
  * @Author dfy
  * @Version v1.0
@@ -26,7 +29,7 @@ public class OneTicketProcessServiceImpl extends ProcessAbstractService {
 
 
 
-	private  final TicketProcessService ticketProcessService;
+	private  final TicketProcessFeignClient ticketProcessService;
 
 
 
@@ -63,6 +66,10 @@ public class OneTicketProcessServiceImpl extends ProcessAbstractService {
 	 */
 	@Override
 	public void calculate(ProcessWorkFlowResponse response) {
-		ticketProcessService.findPending(response);
+		Boolean pending = ticketProcessService.findPending(response);
+		if (!pending) {
+			throw  new ServiceException("工作票流程出现异常呢");
+
+		}
 	}
 }

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java

@@ -1,19 +1,20 @@
-package com.hnac.hzims.ticket.processflow.strategy.serviceimpl;
+package com.hnac.hzims.middle.processflow.strategy.serviceimpl;
 
-import com.hnac.hzims.ticket.processflow.service.ProcessDictService;
+import com.hnac.hzims.middle.processflow.service.ProcessDictService;
-import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService;
+import com.hnac.hzims.middle.processflow.strategy.abstracts.ProcessAbstractService;
-import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
+import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
-
+import com.hnac.hzims.ticket.ticketprocess.feign.TicketProcessFeignClient;
-import com.hnac.hzims.ticket.standardTicket.service.OperationTicketService;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.exception.ServiceException;
 import org.springframework.stereotype.Service;
 
-import static com.hnac.hzims.ticket.processflow.constant.TicketProcessConstant.OPERATION_TICKET_KEY;
+import static com.hnac.hzims.middle.processflow.constant.TicketProcessConstant.OPERATION_TICKET_KEY;
+
 
 /**
- * 开工作票流程实现类
+ * 操作票流程实现类
  *
  * @Author dfy
  * @Version v1.0
@@ -27,7 +28,7 @@ public class OperationTicketProcessServiceImpl extends ProcessAbstractService {
 
 
 
-	private  final OperationTicketService operationTicketService;
+	private  final TicketProcessFeignClient operationTicketService;
 
 
 
@@ -35,10 +36,6 @@ public class OperationTicketProcessServiceImpl extends ProcessAbstractService {
 
 
 
-
-
-
-
 	/**
 	 * 设置执行那种实现类
 	 *
@@ -64,6 +61,10 @@ public class OperationTicketProcessServiceImpl extends ProcessAbstractService {
 	 */
 	@Override
 	public void calculate(ProcessWorkFlowResponse response) {
-		operationTicketService.findPending(response);
+		Boolean pending = operationTicketService.findPending(response);
+		if (!pending) {
+			throw  new ServiceException("操作票流程出现异常呢");
+
+		}
 	}
 }

hzims-service/operational/pom.xml

@@ -245,15 +245,6 @@
             <artifactId>swagger-bootstrap-ui</artifactId>
             <version>${swagger-bootstrap-ui.version}</version>
         </dependency>
-
-
-
-        <dependency>
-            <groupId>com.hnac.hzims</groupId>
-            <artifactId>hzims-model</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
-        </dependency>
-
     </dependencies>
 
     <build>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java

@@ -2,7 +2,7 @@ package com.hnac.hzims.operational.maintenance.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.operational.maintenance.service.MaintenanceService;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java

@@ -2,7 +2,7 @@ package com.hnac.hzims.operational.maintenance.service;
 
 
 
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 
 import java.util.List;
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java

@@ -21,7 +21,7 @@ import com.hnac.hzims.operational.maintenance.service.MaintenanceService;
 import com.hnac.hzims.operational.maintenance.template.service.TemplateService;
 import com.hnac.hzims.operational.maintenance.vo.OperMaintenanceTaskEntityVo;
 import com.hnac.hzims.operational.util.StringObjUtils;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;

hzims-service/ticket/pom.xml

@@ -267,12 +267,6 @@
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.hnac.hzims</groupId>
-            <artifactId>hzims-model</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <!--        <dependency>-->
 <!--            <groupId>com.aliyun</groupId>-->
 <!--            <artifactId>aliyun-java-sdk-ecs</artifactId>-->

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/redisConsume/WorkTicketMsgConsume.java

@@ -5,7 +5,7 @@ import com.hnac.hzims.common.config.RedisMessageListener;
 import com.hnac.hzims.ticket.constants.TicketConstants;
 
 import com.hnac.hzims.ticket.twoTicket.service.IFirstWorkTicketService;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java

@@ -3,9 +3,11 @@ package com.hnac.hzims.ticket.standardTicket.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.ticket.standardTicket.service.OperationTicketService;
 import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
@@ -41,6 +43,23 @@ public class OperationTicketController {
     }
 
 
+    /**
+     * 操作票待处理
+     * @param response
+     */
+    @PostMapping("/findPending")
+    @ApiOperation(value = "操作票待处理")
+    public Boolean findPending(@RequestBody ProcessWorkFlowResponse response){
+        try {
+            operationTicketService.findPending(response);
+            return true;
+        } catch (Exception e) {
+            throw new ServiceException("操作票待处理:" + e.getMessage());
+        }
+    }
+
+
+
 
 
     /**

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardWorkTicketController.java

@@ -8,7 +8,7 @@ import com.hnac.hzims.ticket.processflow.properties.WorkTicketProperties;
 import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
 import com.hnac.hzims.ticket.processflow.strategy.service.ProcessService;
 import com.hnac.hzims.ticket.processflow.strategy.core.ProcessIdWorker;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java

@@ -2,7 +2,7 @@ package com.hnac.hzims.ticket.standardTicket.service;
 
 
 import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 
 import javax.servlet.http.HttpServletResponse;
 

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java

@@ -25,7 +25,7 @@ import com.hnac.hzims.ticket.twoTicket.utils.WordMapUtils;
 import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo;
 import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketMeasureVo;
 import com.hnac.hzims.ticket.utils.PdfUtils;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java

@@ -3,24 +3,16 @@ package com.hnac.hzims.ticket.twoTicket.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.ticket.twoTicket.service.TicketProcessService;
 import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.api.R;
-import org.springblade.flow.core.entity.BladeFlow;
-import org.springblade.flow.core.feign.IFlowClient;
-import org.springblade.flow.core.vo.ComleteTask;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 工作票
@@ -55,6 +47,24 @@ public class TicketProcessController {
 
 
     /**
+     * 工作票待处理
+     * @param response
+     */
+    @PostMapping("/findPending")
+    @ApiOperation(value = "工作票待处理")
+    public Boolean findPending(@RequestBody ProcessWorkFlowResponse response){
+        try {
+            ticketProcessService.findPending(response);
+            return true;
+        } catch (Exception e) {
+            throw new ServiceException("工作票待处理:" + e.getMessage());
+        }
+    }
+
+
+
+
+    /**
      * 预览
      */
     @GetMapping("/newPreview")

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java

@@ -1,7 +1,7 @@
 package com.hnac.hzims.ticket.twoTicket.service;
 
 import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 
 import javax.servlet.http.HttpServletResponse;
 

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

@@ -39,7 +39,7 @@ import com.hnac.hzims.ticket.workTicket.entity.*;
 import com.hnac.hzims.ticket.workTicket.service.*;
 import com.hnac.hzims.ticket.workTicket.service.impl.WorkTicketDelayServiceImpl;
 import com.hnac.hzims.ticket.workTicket.service.impl.WorkTicketOperateTimeServiceImpl;
-import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

pom.xml

@@ -53,7 +53,6 @@
 <!--        <module>blade-gateway</module>-->
         <module>hzims-service</module>
         <module>hzims-service-api</module>
-        <module>hzims-model</module>
     </modules>
 
     <dependencyManagement>