From 31ecdb8c700529a59dd762f0c47f0ed9c66d5092 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 25 九月 2025 20:40:07 +0800
Subject: [PATCH] 工控网任务
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
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
index fdb8d11..8d7334c 100644
--- 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
@@ -7,6 +7,7 @@
import org.jetbrains.annotations.NotNull;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
+import org.springblade.mdm.commons.service.MdmDictBizService;
import org.springblade.mdm.program.service.programannotation.AnnotationUtil;
import org.springblade.mdm.program.vo.ProgramAnnotation;
import org.springblade.mdm.utils.FileContentUtil;
@@ -33,29 +34,29 @@
@Autowired
private IDictBizClient bizDictClient;
-
- private static final String DEFAULT_ANNOTATION_SETTING = "(,)";
+ @Autowired
+ private MdmDictBizService mdmDictBizService;
+ //private static final String DEFAULT_ANNOTATION_SETTING = "(,)";
public static final String ANNOTATION_DICT = "machine_annotation";
/**
* 鍙戦�佺洰褰曡绱㈠紩锛堢2琛岋級 0 based
*/
- public static final int SENDPATH_LINE_INDEX = 1;
+ ///public static final int SENDPATH_LINE_INDEX = 2;
/**
* 鐘舵�佽绱㈠紩锛堢涓夎锛� 0 based
*/
- public static final int STATUS_LINE_INDEX = 2;
+ //public static final int STATUS_LINE_INDEX = 3;
/**
* 鍋忕鍗曟敞閲婅绱㈠紩鍙� 0 based
*/
- public static final int STATUS_DEVIATION_INDEX = 3;
+ //public static final int STATUS_DEVIATION_INDEX = 4;
- public static final String SQ = "SQ";
- public static final String GH = "GH";
- public static final String PL = "PL";
+
public List<DictBiz> getAnnotionDictList(){
+ /*
List<DictBiz> annotationList;
R<List<DictBiz>> dictBizResult = bizDictClient.getList(ANNOTATION_DICT);
@@ -65,7 +66,8 @@
annotationList = Collections.emptyList();
}
- return annotationList;
+ return annotationList;*/
+ return mdmDictBizService.getList(ANNOTATION_DICT);
}
--
Gitblit v1.9.3