From 86c8efdb19a2f4be79a947650ef62ed79382011b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 八月 2025 20:55:31 +0800
Subject: [PATCH] 重构机床回传文件；撤回后禁用撤回按钮
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java | 133 ++++++++++++++++++++++++++------------------
1 files changed, 79 insertions(+), 54 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 ff19e03..9fc4ea6 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
@@ -5,7 +5,9 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
+import org.springblade.mdm.program.vo.ProgramAnnotation;
import org.springblade.mdm.utils.FileContentUtil;
import org.springblade.system.feign.IDictBizClient;
import org.springblade.system.pojo.entity.DictBiz;
@@ -52,12 +54,10 @@
public static final String GH = "GH";
public static final String PL = "PL";
- public List<DictBiz> getAnnotionList(){
+ public List<DictBiz> getAnnotionDictList(){
List<DictBiz> annotationList;
- //R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
+
R<List<DictBiz>> dictBizResult = bizDictClient.getList(ANNOTATION_DICT);
- R<List<DictBiz>> gr = bizDictClient.getList("machine_group");
- R<List<DictBiz>> gcate = bizDictClient.getList("org_category");
if(dictBizResult.isSuccess()) {
annotationList = dictBizResult.getData();
}else{
@@ -76,30 +76,20 @@
*/
public boolean isAnnotation(String line,String machineGroupCode,List<DictBiz> annotationList){
boolean isAnno = false;
- Optional<DictBiz> 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];
- }
+
+ ProgramAnnotation progAnnotation = this.getProgramAnnotationFormat(machineGroupCode,annotationList);
+
line = StringUtils.trim(line);//鍘婚灏剧┖鏍�
- isAnno = StringUtils.startsWith(line,begin) && StringUtils.endsWith(line,end);
- return isAnno;
+ return progAnnotation.isAnnotation(line);
}
public String generateAnnotation(String oriTest,String machineGroupCode,List<DictBiz> annotationList) {
+ /*
String annotation = oriTest;
String begin = "(";
String end = ")";
-
Optional<DictBiz> dictOpt = annotationList.stream().filter(dict -> {return dict.getDictKey().equals(machineGroupCode);}).findFirst();
String annotationSetting = DEFAULT_ANNOTATION_SETTING;
if(dictOpt.isPresent()) {
@@ -110,14 +100,14 @@
begin = arr[0];
end = arr[1];
}else if(arr.length == 1){
- begin = begin = arr[0];
+ begin = arr[0];
end = "";
}
-
- annotation = begin + oriTest + end;
- return annotation;
+ */
+ ProgramAnnotation progAnnotation = this.getProgramAnnotationFormat(machineGroupCode,annotationList);
+ return progAnnotation.addAnnotation(oriTest);
}
-
+ /*
public String[] getAnnotationStartAndEnd(String machineGroupCode,List<DictBiz> annotationList) {
String begin = "(";
@@ -136,47 +126,47 @@
begin = arr[0];
end = "";
}
-
-
+ ProgramAnnotation progAnno = this.getProgramAnnotationFormat(machineGroupCode,annotationList);
return new String[]{begin,end};
}
-
- public String removeAnnotation(String machineGroupCode,String text,String begin,String end){
- List<DictBiz> annoDicts = getAnnotionList();
- String[] arr = getAnnotationStartAndEnd(machineGroupCode,annoDicts);
- return removeAnnotationInner(text,begin,end);
- }
-
- public static String removeAnnotationInner(String text,String begin,String end){
- String temp = StringUtils.removeEnd(StringUtils.removeStart(text,begin),end);
- return temp;
- }
-
-
+*/
/**
- * 璁剧疆鍥哄寲娉ㄩ噴琛�
- * @param inputStream
- * @param machineGroup
- * @param annoDictList
- * @return
- * @throws IOException
+ * 鎻愬彇娉ㄩ噴涓殑鏂囨湰
+ * @param machineGroupCode 鏈哄簥缁勪唬鐮�
+ * @param text 娓呴櫎娉ㄩ噴鏍囪
+ * @return 娓呴櫎鍚庣殑鏂囨湰
*/
- public InputStream setGHAnnotation(InputStream inputStream, String machineGroup,List<DictBiz> annoDictList) throws IOException {
+ public String removeAnnotation(String machineGroupCode,String text){
+ List<DictBiz> annoDicts = getAnnotionDictList();
+ return removeAnnotation(machineGroupCode,text,annoDicts);
+ }
+ public String removeAnnotation(String machineGroupCode,String text,List<DictBiz> annotatiionList){
+ ProgramAnnotation panno = this.getProgramAnnotationFormat(machineGroupCode,annotatiionList);
+ return panno.cleanAnnotation(text);
+ }
+ /**
+ * 璁剧疆鍥哄寲娉ㄩ噴琛�
+ * @param inputStream 杈撳叆妗�
+ * @param machineGroup 鏈哄簥缁勭紪鐮�
+ * @param annoDictList 娉ㄩ噴瀛楀吀閰嶇疆
+ * @return 鍔犲ソ娉ㄩ噴鐨�
+ * @throws IOException
+ */
+ public InputStream setGHAnnotation(InputStream inputStream, String machineGroup,List<DictBiz> annoDictList) throws IOException {
return setAnnotationAndGetInputStream(inputStream, machineGroup, annoDictList, GH, STATUS_LINE_INDEX);
}
/**
* 璁剧疆鍋忕鍗曟敞閲�
- * @param inputStream
- * @param machineGroup
- * @param annoDictList
- * @return
- * @throws IOException
+ * @param inputStream 鏂囨湰杈撳叆娴�
+ * @param machineGroup 鏈哄簥缁勪唬鐮�
+ * @param annoDictList 娉ㄩ噴瀛楀吀閰嶇疆
+ * @return 鍔犲ソ娉ㄩ噴鐨勮緭鍏ユ祦
+ * @throws IOException 璁块棶娴佸彲鑳芥姏鍑哄紓甯�
*/
public InputStream setPldAnnotation(String deviation,InputStream inputStream,String machineGroup,List<DictBiz> annoDictList) throws IOException {
- //
return setAnnotationAndGetInputStream(inputStream, machineGroup, annoDictList, deviation, STATUS_DEVIATION_INDEX);
}
@@ -213,7 +203,7 @@
* @throws IOException
*/
public InputStream setSendDirAndStatusAnnotation(String sendPath,String statusText,InputStream inputStream, String machineGroup) throws IOException {
- List<DictBiz> annoDicts = getAnnotionList();
+ List<DictBiz> annoDicts = getAnnotionDictList();
InputStream finishedStream;
try(inputStream){
@@ -222,12 +212,13 @@
//1鍔犲叆鍙戦�佽矾寰勭殑娉ㄩ噴
String sendPathAnnotation = generateAnnotation(sendPath,machineGroup,annoDicts);//鍔犱簡娉ㄩ噴涔嬪悗鐨勬枃鏈�
- InputStream insAfterSetSendDir ;
+
String sendDirLine = FileContentUtil.readLineAt(byteInputStream,SENDPATH_LINE_INDEX);//绗�2琛屾槸鍙戦�佽矾寰�
byteInputStream.reset();
String statusLine = FileContentUtil.readLineAt(byteInputStream,STATUS_LINE_INDEX);//绗笁琛屾槸鐘舵�佹敞閲�
byteInputStream.reset();
+ InputStream insAfterSetSendDir ;
if(isAnnotation(sendDirLine,machineGroup,annoDicts)){
insAfterSetSendDir = FileContentUtil.replaceAtLine(byteInputStream,SENDPATH_LINE_INDEX,sendPathAnnotation);
}else{
@@ -246,5 +237,39 @@
return finishedStream;
}
+
+ /**
+ * 瑙ｆ瀽鍑烘満搴婄▼搴忔敞閲婄殑鏍煎紡
+ * @param machineGroupCode 鏈哄簥缁�
+ * @param annoDictList 閰嶇疆鐨勬敞閲婂瓧鍏告暟鎹�
+ * @return
+ */
+ ProgramAnnotation getProgramAnnotationFormat(String machineGroupCode,List<DictBiz> annoDictList){
+ String begin;
+ String end;
+
+ Optional<DictBiz> dictOpt = annoDictList.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 = arr[0];
+ end = "";
+ }else{
+ throw new ServiceException("娉ㄩ噴鏍煎紡閰嶇疆閿欒锛屽簲璇ヤ负1鍒�2娈碉紝涓棿鐢ㄩ�楀彿鍒嗛殧");
+ }
+
+ ProgramAnnotation programAnnotation = new ProgramAnnotation();
+ programAnnotation.setBegin(begin);
+ programAnnotation.setEnd(end);
+ return programAnnotation;
+ }
}
+
+
--
Gitblit v1.9.3