From 8a93ac3f06f3a61af3186a333fcba2628dd15f11 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 12 八月 2025 10:46:24 +0800
Subject: [PATCH] 插入注释调整
---
/dev/null | 11 -
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 8
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java | 96 +++++++++++++
blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/ProgramAnnotationServiceTest.java | 52 +++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 209 +++--------------------------
5 files changed, 174 insertions(+), 202 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
index 57291fc..5e5fe63 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
@@ -14,7 +14,6 @@
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
-import org.springblade.core.launch.constant.FlowConstant;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.*;
@@ -46,9 +45,6 @@
private final TaskService taskService;
private final HistoryService historyService;
private final IUserClient userClient;
- private final ProcessProgRefService processProgRefService;
- private final ApproveRecordService approveRecordService;
- private final NcProgramService ncProgramService;
private final FlowProgramFileService flowProgramFileService;
/**
* 鏌ヨ鎴戠殑娴佺▼(涓汉寰呭姙鍒楄〃)
@@ -108,146 +104,6 @@
todoQuery.endOr();
}
}
- /*
- @Override
- public IPage<BladeFlow> selectSendPage(IPage<BladeFlow> page, BladeFlow bladeFlow) {
- String taskUser = TaskUtil.getTaskUser();
- List<BladeFlow> flowList = new LinkedList<>();
-
- HistoricProcessInstanceQuery historyQuery = historyService.createHistoricProcessInstanceQuery().startedBy(taskUser).orderByProcessInstanceStartTime().desc();
-
- if (bladeFlow.getCategory() != null) {
- historyQuery.processDefinitionCategory(bladeFlow.getCategory());
- }
- if (bladeFlow.getProcessDefinitionName() != null) {
- historyQuery.processDefinitionName(bladeFlow.getProcessDefinitionName());
- }
- if (bladeFlow.getBeginDate() != null) {
- historyQuery.startedAfter(bladeFlow.getBeginDate());
- }
- if (bladeFlow.getEndDate() != null) {
- historyQuery.startedBefore(bladeFlow.getEndDate());
- }
-
- // 鏌ヨ鍒楄〃
- List<HistoricProcessInstance> historyList = historyQuery.listPage(Func.toInt((page.getCurrent() - 1) * page.getSize()), Func.toInt(page.getSize()));
-
- historyList.forEach(historicProcessInstance -> {
- BladeFlow flow = new BladeFlow();
- // historicProcessInstance
- flow.setCreateTime(historicProcessInstance.getStartTime());
- flow.setEndTime(historicProcessInstance.getEndTime());
- flow.setVariables(historicProcessInstance.getProcessVariables());
- String[] businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
- if (businessKey.length > 1) {
- flow.setBusinessTable(businessKey[0]);
- flow.setBusinessId(businessKey[1]);
- }
- flow.setHistoryActivityName(historicProcessInstance.getName());
- flow.setProcessInstanceId(historicProcessInstance.getId());
- flow.setHistoryProcessInstanceId(historicProcessInstance.getId());
- // ProcessDefinition
- FlowProcess processDefinition = FlowCache.getProcessDefinition(historicProcessInstance.getProcessDefinitionId());
- flow.setProcessDefinitionId(processDefinition.getId());
- flow.setProcessDefinitionName(processDefinition.getName());
- flow.setProcessDefinitionVersion(processDefinition.getVersion());
- flow.setProcessDefinitionKey(processDefinition.getKey());
- flow.setCategory(processDefinition.getCategory());
- flow.setCategoryName(FlowCache.getCategoryName(processDefinition.getCategory()));
- flow.setProcessInstanceId(historicProcessInstance.getId());
- // HistoricTaskInstance
- List<HistoricTaskInstance> historyTasks = historyService.createHistoricTaskInstanceQuery().processInstanceId(historicProcessInstance.getId()).orderByHistoricTaskInstanceEndTime().desc().list();
- if (Func.isNotEmpty(historyTasks)) {
- HistoricTaskInstance historyTask = historyTasks.iterator().next();
- flow.setTaskId(historyTask.getId());
- flow.setTaskName(historyTask.getName());
- flow.setTaskDefinitionKey(historyTask.getTaskDefinitionKey());
- }
- // Status
- if (historicProcessInstance.getEndActivityId() != null) {
- flow.setProcessIsFinished(FlowEngineConstant.STATUS_FINISHED);
- } else {
- flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
- }
- flow.setStatus(FlowEngineConstant.STATUS_FINISH);
- flowList.add(flow);
- });
-
- // 璁＄畻鎬绘暟
- long count = historyQuery.count();
- // 璁剧疆鎬绘暟
- page.setTotal(count);
- page.setRecords(flowList);
- return page;
- }
-
- @Override
- public IPage<BladeFlow> selectDonePage(IPage<BladeFlow> page, BladeFlow bladeFlow) {
- String taskUser = TaskUtil.getTaskUser();
- List<BladeFlow> flowList = new LinkedList<>();
-
- HistoricTaskInstanceQuery doneQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(taskUser).finished()
- .includeProcessVariables().orderByHistoricTaskInstanceEndTime().desc();
-
- if (bladeFlow.getCategory() != null) {
- doneQuery.processCategoryIn(Func.toStrList(bladeFlow.getCategory()));
- }
- if (bladeFlow.getProcessDefinitionName() != null) {
- doneQuery.processDefinitionName(bladeFlow.getProcessDefinitionName());
- }
- if (bladeFlow.getBeginDate() != null) {
- doneQuery.taskCompletedAfter(bladeFlow.getBeginDate());
- }
- if (bladeFlow.getEndDate() != null) {
- doneQuery.taskCompletedBefore(bladeFlow.getEndDate());
- }
-
- // 鏌ヨ鍒楄〃
- List<HistoricTaskInstance> doneList = doneQuery.listPage(Func.toInt((page.getCurrent() - 1) * page.getSize()), Func.toInt(page.getSize()));
- doneList.forEach(historicTaskInstance -> {
- BladeFlow flow = new BladeFlow();
- flow.setTaskId(historicTaskInstance.getId());
- flow.setTaskDefinitionKey(historicTaskInstance.getTaskDefinitionKey());
- flow.setTaskName(historicTaskInstance.getName());
- flow.setAssignee(historicTaskInstance.getAssignee());
- flow.setCreateTime(historicTaskInstance.getCreateTime());
- flow.setExecutionId(historicTaskInstance.getExecutionId());
- flow.setHistoryTaskEndTime(historicTaskInstance.getEndTime());
- flow.setVariables(historicTaskInstance.getProcessVariables());
-
- FlowProcess processDefinition = FlowCache.getProcessDefinition(historicTaskInstance.getProcessDefinitionId());
- flow.setProcessDefinitionId(processDefinition.getId());
- flow.setProcessDefinitionName(processDefinition.getName());
- flow.setProcessDefinitionKey(processDefinition.getKey());
- flow.setProcessDefinitionVersion(processDefinition.getVersion());
- flow.setCategory(processDefinition.getCategory());
- flow.setCategoryName(FlowCache.getCategoryName(processDefinition.getCategory()));
-
- flow.setProcessInstanceId(historicTaskInstance.getProcessInstanceId());
- flow.setHistoryProcessInstanceId(historicTaskInstance.getProcessInstanceId());
- HistoricProcessInstance historicProcessInstance = getHistoricProcessInstance((historicTaskInstance.getProcessInstanceId()));
- if (Func.isNotEmpty(historicProcessInstance)) {
- String[] businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
- flow.setBusinessTable(businessKey[0]);
- flow.setBusinessId(businessKey[1]);
- if (historicProcessInstance.getEndActivityId() != null) {
- flow.setProcessIsFinished(FlowEngineConstant.STATUS_FINISHED);
- } else {
- flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
- }
- }
- flow.setStatus(FlowEngineConstant.STATUS_FINISH);
- flowList.add(flow);
- });
- // 璁＄畻鎬绘暟
- long count = doneQuery.count();
- // 璁剧疆鎬绘暟
- page.setTotal(count);
- page.setRecords(flowList);
- return page;
- }
-
- */
/**
* 鏋勫缓娴佺▼
*
@@ -288,8 +144,6 @@
flow.setProcessDefinitionId(task.getProcessDefinitionId());
flow.setFile(getFileString(task.getProcessInstanceId()));
- //flow.setProcessDefinitionKey(processDefinition.getKey());
- //flow.setProcessDefinitionVersion(processDefinition.getVersion());
flow.setProcessInstanceId(task.getProcessInstanceId());
// 鏌ヨ娴佺▼瀹炰緥鍒涘缓鏃堕棿
@@ -530,47 +384,15 @@
}
/**
- * 鏌ヨ宸插姙浠诲姟鍒嗛〉鏁版嵁
+ * 涓汉宸插姙(宸插畬鎴愪换鍔�)
* @param page
+ * @param processDefinitionKey
* @param createTimeBegin
* @param createTimeEnd
* @param keyword
* @return
*/
- /*
- public IPage<FlowVO> selectDonePage(IPage<FlowVO> page, LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
- String userId = "" + AuthUtil.getUserId();
- List<FlowVO> flowList = new LinkedList<>();
-
- HistoricTaskInstanceQuery doneTaskQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).finished().includeProcessVariables();
- //TaskQuery todoQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).finished().includeProcessVariables()
- if (Func.isNotEmpty(createTimeBegin)) {
- doneTaskQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
- }
- if (Func.isNotEmpty(createTimeEnd)) {
- doneTaskQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd));
- //todoQuery.taskInProgressStartTimeBefore(DateUtil.toDate(createTimeEnd));
- }
- if (Func.isNotEmpty(keyword)) {
- addKeywordCondition(doneTaskQuery, keyword);
- }
-
- todoQuery.orderByTaskCreateTime().desc();
-
- // 鏋勫缓鍒楄〃鏁版嵁
- FlowVO bladeFlow = new FlowVO();
- buildFlowTaskList(bladeFlow, flowList, todoQuery,page.getCurrent(),page.getSize());
-
- // 璁＄畻鎬绘暟
- long count = todoQuery.count();
-
- // 璁剧疆鎬绘暟
- page.setTotal(count);
- // 璁剧疆鏁版嵁
- page.setRecords(flowList);
- return page;
- }*/
- public IPage<FlowVO> selectDonePage(IPage<FlowVO> page, String processDefinitionKey,LocalDateTime completeTimeBegin, LocalDateTime createTimeEnd, String keyword) {
+ public IPage<FlowVO> selectDonePage(IPage<FlowVO> page, String processDefinitionKey,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
String userId = "" + AuthUtil.getUserId();
HistoricTaskInstanceQuery doneTaskQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).finished().includeProcessVariables();
@@ -578,13 +400,26 @@
if(Func.isNotEmpty(processDefinitionKey)) {
doneTaskQuery.processDefinitionKey(processDefinitionKey);
}
- if(completeTimeBegin!=null) {
- doneTaskQuery.taskCompletedAfter(DateUtil.toDate(completeTimeBegin));
+ if(createTimeBegin!=null) {
+ Date after = DateUtil.toDate(createTimeBegin);
+
+ doneTaskQuery.taskCreatedAfter(after);
+
+ //doneTaskQuery.taskCreatedOn(after);
+ //doneTaskQuery.taskInProgressStartTimeAfter(after);
}
if(createTimeEnd!=null) {
- doneTaskQuery.taskCompletedBefore(DateUtil.toDate(createTimeEnd));
+ Date before = DateUtil.toDate(createTimeEnd);
+
+ doneTaskQuery.taskCreatedBefore(before);
+
+ //doneTaskQuery.taskInProgressStartTimeBefore(before);
}
- //QueryProperty
+
+ if (Func.isNotEmpty(keyword)) {
+ addKeywordCondition(doneTaskQuery, keyword);
+ }
+
doneTaskQuery.orderByTaskCreateTime().desc(); // 鎸夌粨鏉熸椂闂撮檷搴忔帓鍒�
page.setTotal(doneTaskQuery.count());
@@ -594,12 +429,10 @@
.listPage((int)firstResult, (int)page.getSize());
List<FlowVO> records = new LinkedList<>();
- //Map<String,String> processDefKeyMap = new HashMap<>();//浣跨敤TaskDefinitionKey缂撳瓨ProcessDefinitionKey
- //Map<String,String> processDefNameMap = new HashMap<>();//浣跨敤TaskDefinitionKey缂撳瓨ProcessDefinitionName
+
Map<String,String> startUserMap = new HashMap<>();//浣跨敤userId缂撳瓨鍏跺鍚�
for(HistoricTaskInstance hisTask : processes) {
FlowVO vo = new FlowVO();
-
HistoricProcessInstance processInstance = historyService
.createHistoricProcessInstanceQuery()
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MachineAnnotationService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MachineAnnotationService.java
deleted file mode 100644
index a21d59b..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MachineAnnotationService.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-package org.springblade.mdm.program.service;
-
-import com.alibaba.csp.sentinel.util.StringUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springblade.core.mp.base.BizEntity;
-import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.tool.api.R;
-import org.springblade.mdm.basesetting.machine.MachineService;
-import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.flow.entity.FlowProgramFile;
-import org.springblade.mdm.flow.service.ApproveRecordService;
-import org.springblade.mdm.flow.service.FlowProgramFileService;
-import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgramApproved;
-import org.springblade.mdm.program.entity.NcProgramExchange;
-import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
-import org.springblade.mdm.program.vo.DncSendBackData;
-import org.springblade.mdm.utils.FileContentUtil;
-import org.springblade.system.feign.IDictClient;
-import org.springblade.system.pojo.entity.Dict;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-/**
- * 涓嬪彂/鍥炰紶绋嬪簭缁熻
- *
- * @author yangys
- */
-@Slf4j
-@Service
-@AllArgsConstructor
-public class MachineAnnotationService{
-
- //private final NcProgramService progService;
- private final IDictClient dictClient;
- private final MachineService machineService;
- private final NcProgramApprovedService approvedService;
- private final ApproveRecordService approveRecordService;
- private final NcNodeService ncNodeService;
- private final OssTemplate ossTemplate;
- private final FlowProgramFileService flowProgramFileService;
- //public static final String PROGRAM_JSON_FILE = "exp_mdm_nc_program.json";
- //public static final String NODE_JSON_FILE = "exp_mdm_nc_node.json";
- //public static final String APPROVE_RECORD_JSON_FILE = "exp_mdm_approve_record.json";
-
- public static final String ANNOTATION_DICT = "machine_annotation";
-
- public List<Dict> getAnnotionList(){
- List<Dict> annotationList;
- R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
- if(dictsResult.isSuccess()) {
- annotationList = dictsResult.getData();
- }else{
- annotationList = Collections.emptyList();
- }
-
- return annotationList;
- }
-
-
- /**
- * 鍒ゆ柇涓�琛屾枃鏈槸鍚︽槸娉ㄩ噴
- * @param line
- * @param annotationList 娉ㄩ噴娉ㄩ噴瀛楀吀椤瑰垪琛�
- * @return
- */
- public boolean isAnnotation(String line,String machineGroupCode,List<Dict> annotationList){
- boolean isAnno = false;
- Optional<Dict> dictOpt = annotationList.stream().filter(dict -> {return dict.getDictKey().equals(machineGroupCode);}).findFirst();
- String annotationSetting = "(,)";
- if(dictOpt.isPresent()) {
- annotationSetting = dictOpt.get().getDictValue();
- }
- String begin = "";
- String end = "";
- String[] arr = annotationSetting.split(",");
- if(arr.length == 2){
- begin = arr[0];
- end = arr[1];
- }
- isAnno = StringUtils.startsWith(line,begin) && StringUtils.endsWith(line,end);
- return isAnno;
- }
-
-
-
- String generateAnnotation(String oriTest,String machineGroupCode,List<Dict> annotationList) {
- R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
- String annotation = oriTest;
- String begin = "(";
- String end = ")";
-
- Optional<Dict> dictOpt = dictsResult.getData().stream().filter(dict -> {return dict.getDictKey().equals(machineGroupCode);}).findFirst();
- String annotationSetting = "(,)";
- if(dictOpt.isPresent()) {
- annotationSetting = dictOpt.get().getDictValue();
- }
- String[] arr = annotationSetting.split(",");
- if(arr.length == 2){
- begin = arr[0];
- end = arr[1];
- }
-
- annotation = begin + oriTest + end;
- return annotation;
-
- }
-
-}
-
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
index 74f6e91..3617173 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
@@ -58,6 +58,7 @@
private final NcNodeService ncNodeService;
private final OssTemplate ossTemplate;
private final FlowProgramFileService flowProgramFileService;
+ private final ProgramAnnotationService programAnnotationService;
//public static final String PROGRAM_JSON_FILE = "exp_mdm_nc_program.json";
//public static final String NODE_JSON_FILE = "exp_mdm_nc_node.json";
//public static final String APPROVE_RECORD_JSON_FILE = "exp_mdm_approve_record.json";
@@ -121,7 +122,7 @@
}else if(programPackageNode.hasCured()){
status = "GH";
}
- List<Dict> annotationList = getAnnotionList();
+ List<Dict> annotationList = programAnnotationService.getAnnotionList();
for (NcNode node : programNodes) {
String filePathInZip = packageFolder + node.getName();
programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
@@ -157,7 +158,7 @@
*/
InputStream addSendDirAnnotation(InputStream inputStream,Machine machine,List<Dict> annotationList) throws IOException {
//妫�娴嬬浜岃鏄惁鏄矾寰�
- String annotationText = generateAnnotation(machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir(),machine.getMachineGroupCode(),annotationList);
+ String annotationText = programAnnotationService.generateAnnotation(machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir(),machine.getMachineGroupCode(),annotationList);
//TODO 鏀瑰垽鏂鍐呭
return FileContentUtil.insertLine(inputStream,1,annotationText);
@@ -173,7 +174,8 @@
* @throws IOException
*/
InputStream addProgramStatusAnnotation(InputStream inputStream,String status,Machine machine,List<Dict> annotationList) throws IOException {
- String annoText= generateAnnotation(status,machine.getMachineGroupCode(),annotationList);
+ String annoText= programAnnotationService.generateAnnotation(status,machine.getMachineGroupCode(),annotationList);
+
return FileContentUtil.insertLine(inputStream,2,annoText);
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java
new file mode 100644
index 0000000..743671e
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java
@@ -0,0 +1,96 @@
+
+package org.springblade.mdm.program.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.tool.api.R;
+import org.springblade.system.feign.IDictClient;
+import org.springblade.system.pojo.entity.Dict;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 涓嬪彂/鍥炰紶绋嬪簭缁熻
+ *
+ * @author yangys
+ */
+@Slf4j
+@Service
+public class ProgramAnnotationService {
+
+ @Autowired
+ private IDictClient dictClient;
+
+ private static final String DEFAULT_ANNOTATION_SETTING = "(,)";
+
+ public static final String ANNOTATION_DICT = "machine_annotation";
+
+ public List<Dict> getAnnotionList(){
+ List<Dict> annotationList;
+ R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
+ if(dictsResult.isSuccess()) {
+ annotationList = dictsResult.getData();
+ }else{
+ annotationList = Collections.emptyList();
+ }
+
+ return annotationList;
+ }
+
+
+ /**
+ * 鍒ゆ柇涓�琛屾枃鏈槸鍚︽槸娉ㄩ噴
+ * @param line
+ * @param annotationList 娉ㄩ噴娉ㄩ噴瀛楀吀椤瑰垪琛�
+ * @return
+ */
+ public boolean isAnnotation(String line,String machineGroupCode,List<Dict> annotationList){
+ boolean isAnno = false;
+ Optional<Dict> dictOpt = annotationList.stream().filter(dict -> {return dict.getDictKey().equals(machineGroupCode);}).findFirst();
+ String annotationSetting = DEFAULT_ANNOTATION_SETTING;
+ if(dictOpt.isPresent()) {
+ annotationSetting = dictOpt.get().getRemark();
+ }
+ String begin = "";
+ String end = "";
+ String[] arr = annotationSetting.split(",");
+ if(arr.length == 2){
+ begin = arr[0];
+ end = arr[1];
+ }
+ isAnno = StringUtils.startsWith(line,begin) && StringUtils.endsWith(line,end);
+ return isAnno;
+ }
+
+
+
+ public String generateAnnotation(String oriTest,String machineGroupCode,List<Dict> annotationList) {
+
+ String annotation = oriTest;
+ String begin = "(";
+ String end = ")";
+
+ Optional<Dict> dictOpt = annotationList.stream().filter(dict -> {return dict.getDictKey().equals(machineGroupCode);}).findFirst();
+ String annotationSetting = DEFAULT_ANNOTATION_SETTING;
+ if(dictOpt.isPresent()) {
+ annotationSetting = dictOpt.get().getRemark();
+ }
+ String[] arr = StringUtils.split(annotationSetting,",");
+ if(arr.length == 2){
+ begin = arr[0];
+ end = arr[1];
+ }else if(arr.length == 1){
+ begin = begin = arr[0];
+ end = "";
+ }
+
+ annotation = begin + oriTest + end;
+ return annotation;
+ }
+
+}
+
diff --git a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/MachineAnnotationServiceTest.java b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/MachineAnnotationServiceTest.java
deleted file mode 100644
index ae00994..0000000
--- a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/MachineAnnotationServiceTest.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.springblade.mdm.program.service;
-
-import org.junit.jupiter.api.Test;
-
-public class MachineAnnotationServiceTest {
-
- @Test
- public void testIsAnnotation(){
-
- }
-}
diff --git a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/ProgramAnnotationServiceTest.java b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/ProgramAnnotationServiceTest.java
new file mode 100644
index 0000000..352578b
--- /dev/null
+++ b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/program/service/ProgramAnnotationServiceTest.java
@@ -0,0 +1,52 @@
+package org.springblade.mdm.program.service;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springblade.system.pojo.entity.Dict;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ProgramAnnotationServiceTest {
+
+ @Test
+ public void testIsAnnotation(){
+ ProgramAnnotationService s = new ProgramAnnotationService();
+ Dict fanucDict = new Dict();
+ fanucDict.setCode("machine_annotation");
+ fanucDict.setDictKey("FANUC");
+ fanucDict.setRemark("(,)");
+
+ Dict xmz = new Dict();
+ xmz.setCode("machine_annotation");
+ xmz.setDictKey("XIMENZI");
+ xmz.setRemark("*-,");
+
+ List<Dict> dictList = Arrays.asList(fanucDict, xmz);
+ Assertions.assertTrue(s.isAnnotation("(abc)","FANUC", dictList));
+
+ Assertions.assertFalse(s.isAnnotation("*-","FANUC",dictList));
+
+ Assertions.assertTrue(s.isAnnotation("*-","XIMENZI", dictList));
+ }
+
+ @Test
+ public void testIsAnnotation2(){
+ ProgramAnnotationService s = new ProgramAnnotationService();
+ Dict fanucDict = new Dict();
+ fanucDict.setCode("machine_annotation");
+ fanucDict.setDictKey("FANUC");
+ fanucDict.setRemark("(,)");
+
+ Dict xmz = new Dict();
+ xmz.setCode("machine_annotation");
+ xmz.setDictKey("XIMENZI");
+ xmz.setRemark("*-,");
+ List<Dict> dictList = Arrays.asList(fanucDict, xmz);
+
+ Assertions.assertEquals("(A)",s.generateAnnotation("A","FANUC",dictList));
+
+
+ Assertions.assertEquals("*-A",s.generateAnnotation("A","XIMENZI",dictList));
+ }
+}
--
Gitblit v1.9.3