新建 middle-api

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

@@ -57,10 +57,19 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-system-api</artifactId>
         </dependency>
+
+
         <dependency>
             <groupId>com.hnac.hzims</groupId>
             <artifactId>hzims-biz-common</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>middle-api</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -1,6 +1,6 @@
 package com.hnac.hzims.operational.maintenance.feign;
 
-import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.operational.OperationalConstants;
 import com.hnac.hzims.operational.maintenance.feign.fallback.MaintenanceFeignClientFallback;
 import io.swagger.annotations.ApiOperation;

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

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

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

@@ -0,0 +1,42 @@
+<?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-service-api</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>middle-api</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>
+
+
+    <build>
+        <finalName>${project.name}-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <configuration>
+                    <username>${docker.username}</username>
+                    <password>${docker.password}</password>
+                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>${project.version}</tag>
+                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+                    <buildArgs>
+                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

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

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

hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/fallback/ProcessDictFeignServiceFallback.java

@@ -1,6 +1,6 @@
-package com.hnac.hzims.common.logs.fegin.fallback;
+package com.hnac.hzims.middle.process.fallback;
 
-import com.hnac.hzims.common.logs.fegin.ProcessDictFeignService;
+import com.hnac.hzims.middle.process.feign.ProcessDictFeignService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/feign/ProcessDictFeignService.java

@@ -1,6 +1,6 @@
-package com.hnac.hzims.common.logs.fegin;
+package com.hnac.hzims.middle.process.feign;
 
-import com.hnac.hzims.common.logs.fegin.fallback.ProcessDictFeignServiceFallback;
+import com.hnac.hzims.middle.process.fallback.ProcessDictFeignServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Repository;
 import org.springframework.web.bind.annotation.GetMapping;

hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/to/ProcessWorkFlowResponse.java

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

hzims-service-api/pom.xml

@@ -26,6 +26,7 @@
         <module>ticket-api</module>
         <module>weather-api</module>
         <module>common-api</module>
+        <module>middle-api</module>
     </modules>
 
     <dependencies>

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

@@ -21,5 +21,11 @@
 			<groupId>com.hnac.hzims</groupId>
 			<artifactId>hzims-operational-api</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>middle-api</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

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

@@ -1,6 +1,6 @@
 package com.hnac.hzims.ticket.ticketprocess.fallback;
 
-import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.ticket.ticketprocess.feign.OperationTicketFeignClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

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

@@ -1,6 +1,6 @@
 package com.hnac.hzims.ticket.ticketprocess.fallback;
 
-import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.ticket.ticketprocess.feign.TicketProcessFeignClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

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

@@ -1,6 +1,6 @@
 package com.hnac.hzims.ticket.ticketprocess.feign;
 
-import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.ticket.constants.TicketConstants;
 import com.hnac.hzims.ticket.ticketprocess.fallback.OperationTicketFeignClientFallback;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,6 +1,6 @@
 package com.hnac.hzims.ticket.ticketprocess.feign;
 
-import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.ticket.constants.TicketConstants;
 import com.hnac.hzims.ticket.ticketprocess.fallback.TicketProcessFeignClientFallback;
 import io.swagger.annotations.ApiOperation;

hzims-service/hzims-middle/pom.xml

@@ -113,6 +113,11 @@
             <artifactId>ticket-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>middle-api</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -2,11 +2,11 @@ package com.hnac.hzims.middle.processflow.consumer;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.middle.processflow.entity.WorkflowOperationLog;
 import com.hnac.hzims.middle.processflow.service.WorkflowOperationLogService;
 import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
 import com.hnac.hzims.middle.processflow.strategy.service.ProcessService;
-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/ProcessTypeController.java

@@ -5,13 +5,13 @@ 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.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.middle.processflow.entity.ProcessType;
 import com.hnac.hzims.middle.processflow.properties.TicketProperties;
 import com.hnac.hzims.middle.processflow.properties.WorkTicketProperties;
 import com.hnac.hzims.middle.processflow.service.ProcessTypeService;
 import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
 import com.hnac.hzims.middle.processflow.strategy.service.ProcessService;
-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/strategy/service/ProcessService.java

@@ -1,7 +1,7 @@
 package com.hnac.hzims.middle.processflow.strategy.service;
 
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
-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,16 +1,16 @@
 package com.hnac.hzims.middle.processflow.strategy.serviceimpl;
 
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 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.ticket.ticketprocess.feign.OperationTicketFeignClient;
-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.common.logs.constant.TicketProcessConstant.MACHINERY_TICKET_KEY;
+import static com.hnac.hzims.middle.process.constant.TicketProcessConstant.MACHINERY_TICKET_KEY;
 
 
 /**

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

@@ -1,16 +1,16 @@
 package com.hnac.hzims.middle.processflow.strategy.serviceimpl;
 
 
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 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.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.common.logs.constant.TicketProcessConstant.MAINTENANCE_KEY;
+import static com.hnac.hzims.middle.process.constant.TicketProcessConstant.MAINTENANCE_KEY;
 
 
 /**

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

@@ -1,17 +1,17 @@
 package com.hnac.hzims.middle.processflow.strategy.serviceimpl;
 
 
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 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.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.common.logs.constant.TicketProcessConstant.FIRST_TICKET_KEY;
+import static com.hnac.hzims.middle.process.constant.TicketProcessConstant.FIRST_TICKET_KEY;
 
 
 /**

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

@@ -1,16 +1,16 @@
 package com.hnac.hzims.middle.processflow.strategy.serviceimpl;
 
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 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.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.common.logs.constant.TicketProcessConstant.OPERATION_TICKET_KEY;
+import static com.hnac.hzims.middle.process.constant.TicketProcessConstant.OPERATION_TICKET_KEY;
 
 
 /**

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DataServiceImpl.java

@@ -11,7 +11,6 @@ import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO;
 import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeDataConditionVO;
 import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO;
 import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO;
-import com.sun.org.apache.regexp.internal.RE;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.api.R;

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

@@ -1,8 +1,8 @@
 package com.hnac.hzims.operational.maintenance.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.operational.maintenance.service.MaintenanceService;
-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.common.to.process.ProcessWorkFlowResponse;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 
 import java.util.List;
 

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

@@ -11,6 +11,7 @@ import com.hnac.hzims.message.dto.MessagePushRecordDto;
 import com.hnac.hzims.message.dto.PlanMsgRecordDto;
 import com.hnac.hzims.message.entity.config.MessageTemplateEntity;
 import com.hnac.hzims.message.fegin.IMessageClient;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity;
 import com.hnac.hzims.operational.duty.service.IImsDutyMainService;
 import com.hnac.hzims.operational.maintenance.entity.OperMaintenancePlanEntity;
@@ -21,7 +22,6 @@ 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.common.to.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;

hzims-service/pom.xml

@@ -55,6 +55,14 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-datascope</artifactId>
         </dependency>
+
+
+
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>middle-api</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
 </project>

hzims-service/ticket/pom.xml

@@ -280,6 +280,11 @@
 <!--            <artifactId>swagger-bootstrap-ui</artifactId>-->
 <!--            <version>${swagger-bootstrap-ui.version}</version>-->
 <!--        </dependency>-->
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>middle-api</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <repositories>

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

@@ -2,10 +2,10 @@ package com.hnac.hzims.ticket.redisConsume;
 
 import com.alibaba.fastjson.JSONObject;
 import com.hnac.hzims.common.config.RedisMessageListener;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.ticket.constants.TicketConstants;
 
 import com.hnac.hzims.ticket.twoTicket.service.IFirstWorkTicketService;
-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

@@ -1,9 +1,9 @@
 package com.hnac.hzims.ticket.standardTicket.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 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;

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

@@ -1,8 +1,8 @@
 package com.hnac.hzims.ticket.standardTicket.service;
 
 
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo;
-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

@@ -5,12 +5,12 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.hnac.hzims.common.logs.fegin.ProcessDictFeignService;
+import com.hnac.hzims.middle.process.feign.ProcessDictFeignService;
 import com.hnac.hzims.common.logs.utils.StringUtils;
-import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
 import com.hnac.hzims.message.MessageConstants;
 import com.hnac.hzims.message.dto.MessagePushRecordDto;
 import com.hnac.hzims.message.fegin.IMessageClient;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.operational.station.entity.StationEntity;
 import com.hnac.hzims.operational.station.feign.IStationClient;
 import com.hnac.hzims.ticket.constants.TicketConstants;
@@ -52,7 +52,7 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
-import static com.hnac.hzims.common.logs.constant.TicketProcessConstant.OPERATION_TICKET_KEY;
+import static com.hnac.hzims.middle.process.constant.TicketProcessConstant.OPERATION_TICKET_KEY;
 
 
 /**

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

@@ -1,9 +1,9 @@
 package com.hnac.hzims.ticket.twoTicket.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 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 lombok.RequiredArgsConstructor;

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.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo;
-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

@@ -7,11 +7,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.hnac.hzims.common.logs.fegin.ProcessDictFeignService;
 import com.hnac.hzims.common.logs.utils.StringUtils;
 import com.hnac.hzims.message.MessageConstants;
 import com.hnac.hzims.message.dto.MessagePushRecordDto;
 import com.hnac.hzims.message.fegin.IMessageClient;
+import com.hnac.hzims.middle.process.feign.ProcessDictFeignService;
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity;
 import com.hnac.hzims.operational.access.feign.IOperAccessTaskClient;
 import com.hnac.hzims.operational.feign.IAccessTaskClient;
@@ -38,7 +39,6 @@ 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.common.to.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -71,8 +71,8 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.hnac.hzims.common.logs.constant.TicketProcessConstant.FIRST_TICKET_KEY;
+import static com.hnac.hzims.middle.process.constant.TicketProcessConstant.FIRST_TICKET_KEY;
-import static com.hnac.hzims.common.logs.constant.TicketProcessConstant.MACHINERY_TICKET_KEY;
+import static com.hnac.hzims.middle.process.constant.TicketProcessConstant.MACHINERY_TICKET_KEY;
 
 
 /**