linjj
/
docus-collector2.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增被动和主动的任务类型接口

Browse Source
segment2.0
linrf 2 years ago
parent 7aa1921914
commit e59fee9445
6 changed files with 68 additions and 49 deletions
Show Stats Download Patch File Download Diff File

5
common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java
Unescape Escape View File

@ -3,12 +3,11 @@ package com.docus.server.collect.web.process;
import com.docus.core.util.Func;
import com.docus.core.util.SpringUtils;
import com.docus.core.util.json.JSON;
import com.docus.infrastructure.core.db.enums.IIntegerEnum;
import com.docus.log.context.TrackContext;
import com.docus.log.processor.AbstractProcessor;
import com.docus.server.archivefile.service.ITaskMessageService;
import com.docus.server.collect.IConverter;
import com.docus.server.collect.IResult;
import com.docus.server.archivefile.service.ITaskMessageService;
import com.docus.server.enums.CollectTypeEnum;
import com.docus.server.enums.StateEnum;
import com.fasterxml.jackson.core.type.TypeReference;
@ -37,7 +36,7 @@ public class VisitorProcessor extends AbstractProcessor {
if (Func.isEmpty(message)) {
throw new RuntimeException("参数为空");
}
Long taskId = messageService.insertTaskMessage("", message, IIntegerEnum.fromDisplay(CollectTypeEnum.class, context.getGroup()), retryKey);
Long taskId = messageService.insertTaskMessage("", message, CollectTypeEnum.fromDesc(context.getGroup()), retryKey);
String jsonStr = JSON.toJSON(converter.convert(message, context.getGroup()));
messageService.updateTaskMessage(taskId, jsonStr, context.getExMessageResult(), StateEnum.OK);
Map<String, Object> params = context.getParams();

6
common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageController.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.api.archivefile.TaskMessageApi;
import com.docus.server.archivefile.service.ITaskMessageService;
import com.docus.server.enums.CollectTypeEnum;
import com.docus.server.vo.TaskMessageVO;
import org.springframework.web.bind.annotation.RestController;
@ -58,4 +59,9 @@ public class TaskMessageController implements TaskMessageApi {
public void findRetry(List<Long> ids) throws Exception {
taskMessageService.findRetry(ids);
}
@Override
public CollectTypeEnum[] findType() {
return CollectTypeEnum.values();
}
}

4
common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConvert.java
Unescape Escape View File

@ -28,8 +28,8 @@ public interface TaskMessageConvert {
default TaskMessage convert(String json, String xml, CollectTypeEnum collectType, String retryKey, Long id) {
TaskMessage taskOriginalMessage = new TaskMessage();
taskOriginalMessage.setId(id);
taskOriginalMessage.setName(collectType.name());
taskOriginalMessage.setMemo(collectType.getDesc());
taskOriginalMessage.setName(collectType.getDesc());
taskOriginalMessage.setMemo(collectType.getDisplay());
taskOriginalMessage.setCollectType(collectType);
taskOriginalMessage.setRetryKey(retryKey);
taskOriginalMessage.setJsonStr(json);

8
docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.docus.server.api.archivefile;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.enums.CollectTypeEnum;
import com.docus.server.vo.TaskMessageVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -59,4 +60,11 @@ public interface TaskMessageApi {
@ApiOperation("根据主键批量重试")
@PostMapping("/find/retry")
void findRetry(@RequestBody List<Long> ids) throws Exception;
/**
* 任务类型查询
*/
@ApiOperation("任务类型查询")
@GetMapping("/find/type")
CollectTypeEnum[] findType();
}

2
docus-client-interface/src/main/java/com/docus/server/entity/TaskConfig.java
Unescape Escape View File

@ -40,6 +40,8 @@ public class TaskConfig {
@ApiModelProperty(value = "任务类型")
private String type;
@ApiModelProperty(value = "任务描述")
private String memo;
/**
* 数据起始时间范围
*/

92
docus-client-interface/src/main/java/com/docus/server/enums/CollectTypeEnum.java
Unescape Escape View File

@ -2,64 +2,54 @@ package com.docus.server.enums;
import com.docus.infrastructure.core.db.enums.IIntegerEnum;
import java.util.Objects;
public enum CollectTypeEnum implements IIntegerEnum {
/**
* WS
*/
WEBSERVICE_XML_DEPT(0, "WEBSERVICE_XML_DEPT", "新增/修改-科室信息"),
WEBSERVICE_XML_USER(1, "WEBSERVICE_XML_USER", "新增/修改-用户信息"),
WEBSERVICE_XML_INSERT_BASIC(2, "WEBSERVICE_XML_BASIC", "新增/修改-基础数据"),
WEBSERVICE_XML_UPDATE_BASIC(2, "WEBSERVICE_XML_BASIC", "新增/修改-基础数据"),
WEBSERVICE_XML_SA_REPORT(3, "WEBSERVICE_XML_SA_REPORT", "新增-手麻报告信息"),
WEBSERVICE_XML_ICU_REPORT(4, "WEBSERVICE_XML_ICU_REPORT", "新增-重症报告信息"),
WEBSERVICE_XML_EXAMINATION_REPORT(5, "WEBSERVICE_XML_EXAMINATION_REPORT", "新增-检验报告信息"),
WEBSERVICE_XML_INSERT_INSPECTION_REPORT(6, "WEBSERVICE_XML_INSERT_INSPECTION_REPORT", "新增-检查报告的信息"),
WEBSERVICE_XML_UPDATE_INSPECTION_REPORT(7, "WEBSERVICE_XML_UPDATE_INSPECTION_REPORT", "更新-检查报告的信息"),
WEBSERVICE_XML_DEPT(0, "WEBSERVICE_新增/修改-科室信息", "WEBSERVICE_XML_DEPT"),
WEBSERVICE_XML_USER(1, "WEBSERVICE_新增/修改-用户信息", "WEBSERVICE_XML_USER"),
WEBSERVICE_XML_INSERT_BASIC(2, "WEBSERVICE_新增/修改-基础数据", "WEBSERVICE_XML_BASIC"),
WEBSERVICE_XML_UPDATE_BASIC(2, "WEBSERVICE_新增/修改-基础数据", "WEBSERVICE_XML_BASIC"),
WEBSERVICE_XML_SA_REPORT(3, "WEBSERVICE_新增-手麻报告信息", "WEBSERVICE_XML_SA_REPORT"),
WEBSERVICE_XML_ICU_REPORT(4, "WEBSERVICE_新增-重症报告信息", "WEBSERVICE_XML_ICU_REPORT"),
WEBSERVICE_XML_EXAMINATION_REPORT(5, "WEBSERVICE_新增-检验报告信息", "WEBSERVICE_XML_EXAMINATION_REPORT"),
WEBSERVICE_XML_INSERT_INSPECTION_REPORT(6, "WEBSERVICE_新增-检查报告的信息", "WEBSERVICE_XML_INSERT_INSPECTION_REPORT"),
WEBSERVICE_XML_UPDATE_INSPECTION_REPORT(7, "WEBSERVICE_更新-检查报告的信息", "WEBSERVICE_XML_UPDATE_INSPECTION_REPORT"),
/**
* HTTP
*/
HTTP_PASSIVE_USER(8, "HTTP_PASSIVE_USER", "新增/修改-用户信息"),
HTTP_PASSIVE_DEPT(9, "HTTP_PASSIVE_DEPT", "新增/修改-科室信息"),
HTTP_PASSIVE_BASIC(10, "HTTP_PASSIVE_BASIC", "新增/修改-基础数据"),
HTTP_PASSIVE_USER(8, "HTTP_新增/修改-用户信息", "HTTP_PASSIVE_USER"),
HTTP_PASSIVE_DEPT(9, "HTTP_新增/修改-科室信息", "HTTP_PASSIVE_DEPT"),
HTTP_PASSIVE_BASIC(10, "HTTP_新增/修改-基础数据", "HTTP_PASSIVE_BASIC"),
/**
* MQ
*/
JMS_MQ_PASSIVE_INSERT_USER(11, "JMS_MQ_PASSIVE_INSERT_USER", "新增-用户信息"),
JMS_MQ_PASSIVE_UPDATE_USER(12, "JMS_MQ_PASSIVE_UPDATE_USER", "修改-用户信息"),
JMS_MQ_PASSIVE_INSERT_DEPT(13, "JMS_MQ_PASSIVE_INSERT_DEPT", "新增-科室信息"),
JMS_MQ_PASSIVE_UPDATE_DEPT(14, "JMS_MQ_PASSIVE_UPDATE_DEPT", "修改-科室信息"),
JMS_MQ_PASSIVE_INSERT_BASIC(15, "JMS_MQ_PASSIVE_INSERT_BASIC", "新增-基础数据"),
JMS_MQ_PASSIVE_UPDATE_BASIC(16, "JMS_MQ_PASSIVE_UPDATE_BASIC", "修改-基础数据"),
ROCKET_MQ_PASSIVE_INSERT_USER(17, "ROCKET_MQ_PASSIVE_INSERT_USER", "新增-用户信息"),
ROCKET_MQ_PASSIVE_UPDATE_USER(18, "ROCKET_MQ_PASSIVE_UPDATE_USER", "修改-用户信息"),
ROCKET_MQ_PASSIVE_INSERT_DEPT(19, "ROCKET_MQ_PASSIVE_INSERT_DEPT", "新增-科室信息"),
ROCKET_MQ_PASSIVE_UPDATE_DEPT(20, "ROCKET_MQ_PASSIVE_UPDATE_DEPT", "修改-科室信息"),
ROCKET_MQ_PASSIVE_INSERT_BASIC(21, "ROCKET_MQ_PASSIVE_INSERT_BASIC", "新增-基础数据"),
ROCKET_MQ_PASSIVE_UPDATE_BASIC(22, "ROCKET_MQ_PASSIVE_UPDATE_BASIC", "修改-基础数据"),
RABBIT_MQ_PASSIVE_INSERT_USER(23, "RABBIT_MQ_PASSIVE_INSERT_USER", "新增-用户信息"),
RABBIT_MQ_PASSIVE_UPDATE_USER(24, "RABBIT_MQ_PASSIVE_UPDATE_USER", "修改-用户信息"),
RABBIT_MQ_PASSIVE_INSERT_DEPT(25, "RABBIT_MQ_PASSIVE_INSERT_DEPT", "新增-科室信息"),
RABBIT_MQ_PASSIVE_UPDATE_DEPT(26, "RABBIT_MQ_PASSIVE_UPDATE_DEPT", "修改-科室信息"),
RABBIT_MQ_PASSIVE_INSERT_BASIC(27, "RABBIT_MQ_PASSIVE_INSERT_BASIC", "新增-基础数据"),
RABBIT_MQ_PASSIVE_UPDATE_BASIC(28, "RABBIT_MQ_PASSIVE_UPDATE_BASIC", "修改-基础数据"),
JMS_MQ_PASSIVE_INSERT_USER(11, "JMS_MQ_新增-用户信息", "JMS_MQ_PASSIVE_INSERT_USER"),
JMS_MQ_PASSIVE_UPDATE_USER(12, "JMS_MQ_修改-用户信息", "JMS_MQ_PASSIVE_UPDATE_USER"),
JMS_MQ_PASSIVE_INSERT_DEPT(13, "JMS_MQ_ 新增-科室信息", "JMS_MQ_PASSIVE_INSERT_DEPT"),
JMS_MQ_PASSIVE_UPDATE_DEPT(14, "JMS_MQ_修改-科室信息", "JMS_MQ_PASSIVE_UPDATE_DEPT"),
JMS_MQ_PASSIVE_INSERT_BASIC(15, "JMS_MQ_新增-基础数据", "JMS_MQ_PASSIVE_INSERT_BASIC"),
JMS_MQ_PASSIVE_UPDATE_BASIC(16, "JMS_MQ_修改-基础数据", "JMS_MQ_PASSIVE_UPDATE_BASIC"),
ROCKET_MQ_PASSIVE_INSERT_USER(17, "ROCKET_MQ_新增-用户信息", "ROCKET_MQ_PASSIVE_INSERT_USER"),
ROCKET_MQ_PASSIVE_UPDATE_USER(18, "ROCKET_MQ_修改-用户信息", "ROCKET_MQ_PASSIVE_UPDATE_USER"),
ROCKET_MQ_PASSIVE_INSERT_DEPT(19, "ROCKET_MQ_新增-科室信息", "ROCKET_MQ_PASSIVE_INSERT_DEPT"),
ROCKET_MQ_PASSIVE_UPDATE_DEPT(20, "ROCKET_MQ_修改-科室信息", "ROCKET_MQ_PASSIVE_UPDATE_DEPT"),
ROCKET_MQ_PASSIVE_INSERT_BASIC(21, "ROCKET_MQ_新增-基础数据", "ROCKET_MQ_PASSIVE_INSERT_BASIC"),
ROCKET_MQ_PASSIVE_UPDATE_BASIC(22, "ROCKET_MQ_修改-基础数据", "ROCKET_MQ_PASSIVE_UPDATE_BASIC"),
RABBIT_MQ_PASSIVE_INSERT_USER(23, "RABBIT_MQ_新增-用户信息", "RABBIT_MQ_PASSIVE_INSERT_USER"),
RABBIT_MQ_PASSIVE_UPDATE_USER(24, "RABBIT_MQ_修改-用户信息", "RABBIT_MQ_PASSIVE_UPDATE_USER"),
RABBIT_MQ_PASSIVE_INSERT_DEPT(25, "RABBIT_MQ_新增-科室信息", "RABBIT_MQ_PASSIVE_INSERT_DEPT"),
RABBIT_MQ_PASSIVE_UPDATE_DEPT(26, "RABBIT_MQ_修改-科室信息", "RABBIT_MQ_PASSIVE_UPDATE_DEPT"),
RABBIT_MQ_PASSIVE_INSERT_BASIC(27, "RABBIT_MQ_新增-基础数据", "RABBIT_MQ_PASSIVE_INSERT_BASIC"),
RABBIT_MQ_PASSIVE_UPDATE_BASIC(28, "RABBIT_MQ_修改-基础数据", "RABBIT_MQ_PASSIVE_UPDATE_BASIC"),
/**
* JOB
*/
JOB_VIEW_DEPT(29, "JOB_VIEW_DEPT", "新增/修改-科室信息"),
JOB_USER(30, "JOB_USER", "新增/修改-用户信息"),
JOB_INSERT_BASIC(31, "JOB_INSERT_BASIC", "新增/修改-基础数据"),
JOB_UPDATE_BASIC(32, "JOB_UPDATE_BASIC", "新增/修改-基础数据"),
JOB_SA_REPORT(33, "JOB_SA_REPORT", "新增-手麻报告信息"),
JOB_ICU_REPORT(34, "JOB_ICU_REPORT", "新增-重症报告信息"),
JOB_REPORT(35, "JOB_REPORT", "新增-检验报告信息"),
JOB_INSERT_REPORT(36, "JOB_INSERT_REPORT", "新增-检查报告的信息"),
JOB_UPDATE_REPORT(37, "JOB_UPDATE_REPORT", "更新-检查报告的信息"),
;
private Integer value;
@ -86,4 +76,18 @@ public enum CollectTypeEnum implements IIntegerEnum {
return display;
}
public static CollectTypeEnum fromDesc(String desc) {
for (CollectTypeEnum typeEnum : CollectTypeEnum.values()) {
if (Objects.equals(desc, typeEnum.getDesc())) {
return typeEnum;
}
}
throw new IllegalArgumentException("No. enum value 。" + desc + "");
}
public static void main(String[] args) {
CollectTypeEnum[] values = CollectTypeEnum.values();
System.out.println(values);
}
}

Write Preview
Loading…
Cancel
Save