修改docx模版及新建model

hzims-model/pom.xml

@@ -0,0 +1,48 @@
+<?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-model/src/main/java/com/hnac/hzims/vo/process/ProcessWorkFlowResponse.java

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

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

@@ -57,6 +57,14 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-system-api</artifactId>
         </dependency>
+
+
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>hzims-model</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

@@ -2,7 +2,7 @@ package com.hnac.hzims.operational.maintenance.feign;
 
 import com.hnac.hzims.operational.OperationalConstants;
 import com.hnac.hzims.operational.maintenance.feign.fallback.MaintenanceFeignClientFallback;
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
+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.operational.maintenance.feign.MaintenanceFeignClient;
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
+import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 import org.springframework.stereotype.Component;
 
 /**

hzims-service/operational/pom.xml

@@ -247,6 +247,13 @@
         </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.operational.maintenance.vo.ProcessWorkFlowResponse;
+import com.hnac.hzims.vo.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

@@ -1,7 +1,8 @@
 package com.hnac.hzims.operational.maintenance.service;
 
 
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
+
+import com.hnac.hzims.vo.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.operational.maintenance.vo.ProcessWorkFlowResponse;
+import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;

hzims-service/ticket/pom.xml

@@ -267,7 +267,13 @@
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
         </dependency>
-<!--        <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>-->
 <!--            <version>4.2.0</version>-->

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

@@ -6,7 +6,7 @@ import com.hnac.hzims.ticket.processflow.entity.WorkflowOperationLog;
 import com.hnac.hzims.ticket.processflow.service.WorkflowOperationLogService;
 import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
 import com.hnac.hzims.ticket.processflow.strategy.service.ProcessService;
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
+import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.queue.annotation.RedisQueue;
 import org.springblade.queue.consume.IQueueConsume;

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

@@ -11,7 +11,7 @@ import com.hnac.hzims.ticket.processflow.properties.WorkTicketProperties;
 import com.hnac.hzims.ticket.processflow.service.ProcessTypeService;
 import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
 import com.hnac.hzims.ticket.processflow.strategy.service.ProcessService;
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
+import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.jackson.JsonUtil;

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

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

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

@@ -4,7 +4,7 @@ import com.hnac.hzims.ticket.processflow.service.ProcessDictService;
 import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService;
 import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
 import com.hnac.hzims.ticket.twoTicket.service.TicketProcessService;
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
+import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -4,7 +4,7 @@ import com.hnac.hzims.operational.maintenance.feign.MaintenanceFeignClient;
 import com.hnac.hzims.ticket.processflow.service.ProcessDictService;
 import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService;
 import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
+import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;

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

@@ -1,10 +1,10 @@
 package com.hnac.hzims.ticket.processflow.strategy.serviceimpl;
 
 import com.hnac.hzims.ticket.processflow.service.ProcessDictService;
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
 import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService;
 import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
 import com.hnac.hzims.ticket.twoTicket.service.TicketProcessService;
+import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -3,8 +3,9 @@ package com.hnac.hzims.ticket.processflow.strategy.serviceimpl;
 import com.hnac.hzims.ticket.processflow.service.ProcessDictService;
 import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService;
 import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
+
 import com.hnac.hzims.ticket.standardTicket.service.OperationTicketService;
+import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -3,8 +3,9 @@ package com.hnac.hzims.ticket.redisConsume;
 import com.alibaba.fastjson.JSONObject;
 import com.hnac.hzims.common.config.RedisMessageListener;
 import com.hnac.hzims.ticket.constants.TicketConstants;
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
+
 import com.hnac.hzims.ticket.twoTicket.service.IFirstWorkTicketService;
+import com.hnac.hzims.vo.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/StandardWorkTicketController.java

@@ -2,13 +2,13 @@ package com.hnac.hzims.ticket.standardTicket.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
 import com.hnac.hzims.ticket.standardTicket.service.StandardWorkTicketService;
 import com.hnac.hzims.ticket.processflow.properties.TicketProperties;
 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 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

@@ -1,7 +1,8 @@
 package com.hnac.hzims.ticket.standardTicket.service;
 
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
+
 import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo;
+import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 
 import javax.servlet.http.HttpServletResponse;
 

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

@@ -14,7 +14,6 @@ import com.hnac.hzims.operational.station.feign.IStationClient;
 import com.hnac.hzims.ticket.constants.TicketConstants;
 import com.hnac.hzims.ticket.processflow.service.ProcessDictService;
 import com.hnac.hzims.ticket.processflow.strategy.core.ProcessIdWorker;
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
 import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity;
 import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketMeasureEntity;
 import com.hnac.hzims.ticket.standardTicket.service.IStandardTicketInfoService;
@@ -26,6 +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 lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

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

@@ -42,7 +42,7 @@ public class OperationWordHelper {
     public static String getWorkTicketStatus(Integer status) {
         String result = null;
         switch (status) {
-            case 0:
+            case 1:
                 result =  "电气操作票.docx";
             default:
                 result = "电气操作票.docx";

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.operational.maintenance.vo.ProcessWorkFlowResponse;
 import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo;
+import com.hnac.hzims.vo.process.ProcessWorkFlowResponse;
 
 import javax.servlet.http.HttpServletResponse;
 

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

@@ -22,7 +22,6 @@ import com.hnac.hzims.ticket.constants.TicketConstants;
 import com.hnac.hzims.ticket.constants.WorkTicketConstants;
 import com.hnac.hzims.ticket.processflow.service.ProcessDictService;
 import com.hnac.hzims.ticket.processflow.strategy.core.ProcessIdWorker;
-import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse;
 import com.hnac.hzims.ticket.twoTicket.constant.TicketConstant;
 import com.hnac.hzims.ticket.twoTicket.entity.TicketInfoDanger;
 import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish;
@@ -40,6 +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 lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

pom.xml

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