yangshj
/
zhongwei
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

processFlow迁移

zhongwei
段飞宇 2 years ago
parent
9733af7632
commit
722818a0af
84 changed files with 1747 additions and 1616 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      hzims-biz-common/src/main/java/com/hnac/hzims/common/to/process/ProcessWorkFlowResponse.java
  2. 48
      hzims-model/pom.xml
  3. 4
      hzims-service-api/hzims-operational-api/pom.xml
  4. 2
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/MaintenanceFeignClient.java
  5. 2
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/fallback/MaintenanceFeignClientFallback.java
  6. 2
      hzims-service-api/ticket-api/pom.xml
  7. 27
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/fallback/OperationTicketFeignClientFallback.java
  8. 27
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/fallback/TicketProcessFeignClientFallback.java
  9. 34
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/feign/OperationTicketFeignClient.java
  10. 33
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/feign/TicketProcessFeignClient.java
  11. 14
      hzims-service/hzims-middle/pom.xml
  12. 2
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/CodeGenerator.java
  13. 2
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/constant/TicketProcessConstant.java
  14. 12
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/consumer/StandardWorkTicketConsumer.java
  15. 9
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/ProcessDictController.java
  16. 16
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/ProcessTypeController.java
  17. 2
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/WorkflowOperationLogController.java
  18. 2
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/entity/ProcessDict.java
  19. 2
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/entity/ProcessType.java
  20. 16
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/entity/WorkflowOperationLog.java
  21. 4
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/mapper/ProcessDictMapper.java
  22. 4
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/mapper/ProcessTypeMapper.java
  23. 4
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/mapper/WorkflowOperationLogMapper.java
  24. 2
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/properties/TicketProperties.java
  25. 2
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/properties/WorkTicketProperties.java
  26. 4
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/ProcessDictService.java
  27. 4
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/ProcessTypeService.java
  28. 4
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/WorkflowOperationLogService.java
  29. 12
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/impl/ProcessDictServiceImpl.java
  30. 8
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/impl/ProcessTypeServiceImpl.java
  31. 8
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/impl/WorkflowOperationLogServiceImpl.java
  32. 8
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/abstracts/ProcessAbstractService.java
  33. 2
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/core/ProcessIdWorker.java
  34. 2
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/entity/WorkflowQueue.java
  35. 6
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/service/ProcessService.java
  36. 24
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java
  37. 14
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/MaintenanceProcessServiceImpl.java
  38. 27
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java
  39. 31
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java
  40. 9
      hzims-service/operational/pom.xml
  41. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java
  42. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java
  43. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java
  44. 6
      hzims-service/ticket/pom.xml
  45. 2
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/redisConsume/WorkTicketMsgConsume.java
  46. 19
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java
  47. 2
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardWorkTicketController.java
  48. 2
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java
  49. 2
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java
  50. 30
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java
  51. 2
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java
  52. 2
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java
  53. BIN
      hzims-service/ticket/src/main/resources/template/水力机械工作票模版.docx
  54. BIN
      hzims-service/ticket/src/main/resources/template/电气第二种工作票模版.docx
  55. 1
      pom.xml

2
hzims-model/src/main/java/com/hnac/hzims/vo/process/ProcessWorkFlowResponse.java → hzims-biz-common/src/main/java/com/hnac/hzims/common/to/process/ProcessWorkFlowResponse.java
Unescape View File

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

48
hzims-model/pom.xml
Unescape View File

@ -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>

4
hzims-service-api/hzims-operational-api/pom.xml
Unescape View File

@ -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>

2
hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/MaintenanceFeignClient.java
Unescape View File

@ -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;

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

@ -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;
/**

2
hzims-service-api/ticket-api/pom.xml
Unescape View File

@ -21,5 +21,5 @@
<groupId>com.hnac.hzims</groupId>
<artifactId>hzims-operational-api</artifactId>
</dependency>
</dependencies>
</dependencies>
</project>

27
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/fallback/OperationTicketFeignClientFallback.java
Unescape View File

@ -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;
}
}

27
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/fallback/TicketProcessFeignClientFallback.java
Unescape View File

@ -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;
}
}

34
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/feign/OperationTicketFeignClient.java
Unescape View File

@ -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);
}

33
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/ticketprocess/feign/TicketProcessFeignClient.java
Unescape View File

@ -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);
}

14
hzims-service/hzims-middle/pom.xml
Unescape View File

@ -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>

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/CodeGenerator.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/CodeGenerator.java
Unescape View File

@ -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;

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/constant/TicketProcessConstant.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/constant/TicketProcessConstant.java
Unescape View File

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

12
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/consumer/StandardWorkTicketConsumer.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/consumer/StandardWorkTicketConsumer.java
Unescape View File

@ -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.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.vo.process.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;

9
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessDictController.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/ProcessDictController.java
Unescape View File

@ -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 groovy.util.logging.Slf4j;
import com.hnac.hzims.middle.processflow.entity.ProcessDict;
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;

16
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessTypeController.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/ProcessTypeController.java
Unescape View File

@ -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.ticket.processflow.properties.TicketProperties;
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.vo.process.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;

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/WorkflowOperationLogController.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/WorkflowOperationLogController.java
Unescape View File

@ -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;

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/entity/ProcessDict.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/entity/ProcessDict.java
Unescape View File

@ -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;

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/entity/ProcessType.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/entity/ProcessType.java
Unescape View File

@ -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;

16
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/entity/WorkflowOperationLog.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/entity/WorkflowOperationLog.java
Unescape View File

@ -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")
private String formData;
@TableField("variables")
private String variables;
/**
* 用户Id
*/
@TableField("variables")
private String userId;
/**
* 创建时间

4
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/mapper/ProcessDictMapper.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/mapper/ProcessDictMapper.java
Unescape View File

@ -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;
/**

4
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/mapper/ProcessTypeMapper.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/mapper/ProcessTypeMapper.java
Unescape View File

@ -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>

4
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/mapper/WorkflowOperationLogMapper.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/mapper/WorkflowOperationLogMapper.java
Unescape View File

@ -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>

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/properties/TicketProperties.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/properties/TicketProperties.java
Unescape View File

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

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/properties/WorkTicketProperties.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/properties/WorkTicketProperties.java
Unescape View File

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

4
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/ProcessDictService.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/ProcessDictService.java
Unescape View File

@ -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

4
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/ProcessTypeService.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/ProcessTypeService.java
Unescape View File

@ -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>

4
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/WorkflowOperationLogService.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/WorkflowOperationLogService.java
Unescape View File

@ -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>

12
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/impl/ProcessDictServiceImpl.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/impl/ProcessDictServiceImpl.java
Unescape View File

@ -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.ticket.processflow.mapper.ProcessDictMapper;
import com.hnac.hzims.ticket.processflow.service.ProcessDictService;
import groovy.util.logging.Slf4j;
import com.hnac.hzims.middle.processflow.entity.ProcessDict;
import com.hnac.hzims.middle.processflow.mapper.ProcessDictMapper;
import com.hnac.hzims.middle.processflow.service.ProcessDictService;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
*/
@Slf4j
@Service
public class ProcessDictServiceImpl extends ServiceImpl<ProcessDictMapper, ProcessDict> implements ProcessDictService {
public class ProcessDictServiceImpl extends ServiceImpl<ProcessDictMapper, ProcessDict> implements ProcessDictService {
/**
* 根据字典key查询字典value
*

8
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/impl/ProcessTypeServiceImpl.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/impl/ProcessTypeServiceImpl.java
Unescape View File

@ -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.ticket.processflow.mapper.ProcessTypeMapper;
import com.hnac.hzims.ticket.processflow.service.ProcessTypeService;
import com.hnac.hzims.middle.processflow.entity.ProcessType;
import com.hnac.hzims.middle.processflow.mapper.ProcessTypeMapper;
import com.hnac.hzims.middle.processflow.service.ProcessTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

8
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/impl/WorkflowOperationLogServiceImpl.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/impl/WorkflowOperationLogServiceImpl.java
Unescape View File

@ -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;
/**

8
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/abstracts/ProcessAbstractService.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/abstracts/ProcessAbstractService.java
Unescape View File

@ -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.ticket.processflow.service.ProcessTypeService;
import com.hnac.hzims.ticket.processflow.strategy.service.ProcessService;
import com.hnac.hzims.middle.processflow.entity.ProcessType;
import com.hnac.hzims.middle.processflow.service.ProcessTypeService;
import com.hnac.hzims.middle.processflow.strategy.service.ProcessService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/core/ProcessIdWorker.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/core/ProcessIdWorker.java
Unescape View File

@ -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;

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/entity/WorkflowQueue.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/entity/WorkflowQueue.java
Unescape View File

@ -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;

6
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/service/ProcessService.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/service/ProcessService.java
Unescape View File

@ -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.vo.process.ProcessWorkFlowResponse;
import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
import com.hnac.hzims.common.to.process.ProcessWorkFlowResponse;
/**
* @Author dfy

24
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java
Unescape View File

@ -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.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 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.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("水力机械工作票流程出现异常呢");
}
}
}

14
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/MaintenanceProcessServiceImpl.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/MaintenanceProcessServiceImpl.java
Unescape View File

@ -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.ticket.processflow.strategy.abstracts.ProcessAbstractService;
import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
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.MAINTENANCE_KEY;
import static com.hnac.hzims.middle.processflow.constant.TicketProcessConstant.MAINTENANCE_KEY;
/**
* 日常维护实现类

27
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java
Unescape View File

@ -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.ticket.processflow.strategy.entity.WorkflowQueue;
import com.hnac.hzims.ticket.twoTicket.service.TicketProcessService;
import com.hnac.hzims.vo.process.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.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("工作票流程出现异常呢");
}
}
}

31
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java → hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java
Unescape View File

@ -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.ticket.processflow.strategy.abstracts.ProcessAbstractService;
import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
import com.hnac.hzims.ticket.standardTicket.service.OperationTicketService;
import com.hnac.hzims.vo.process.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.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("操作票流程出现异常呢");
}
}
}

9
hzims-service/operational/pom.xml
Unescape View File

@ -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>

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java
Unescape View File

@ -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;

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java
Unescape View File

@ -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;

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java
Unescape View File

@ -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;

6
hzims-service/ticket/pom.xml
Unescape View File

@ -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>-->

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/redisConsume/WorkTicketMsgConsume.java
Unescape View File

@ -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;

19
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java
Unescape View File

@ -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());
}
}
/**

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardWorkTicketController.java
Unescape View File

@ -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;

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java
Unescape View File

@ -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;

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java
Unescape View File

@ -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;

30
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java
Unescape View File

@ -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")

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java
Unescape View File

@ -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;

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java
Unescape View File

@ -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;

BIN
hzims-service/ticket/src/main/resources/template/水力机械工作票模版.docx
View File

Binary file not shown.

BIN
hzims-service/ticket/src/main/resources/template/电气第二种工作票模版.docx
View File

Binary file not shown.

1
pom.xml
Unescape View File

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

Write Preview
Loading…
Cancel
Save