From 70b4334de4fb9a7055fc4e6956f8666ebe867b94 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 八月 2025 14:30:53 +0800
Subject: [PATCH] 注释功能调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramAnnotationService.java | 130 ++++++++++++---------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java | 8
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/ProgramAnnotation.java | 43 +++++++
blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/ProgramConfirmTableServiceTest.java | 60 ++--------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java | 12 -
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java | 71 ++++++++++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java | 2
9 files changed, 205 insertions(+), 125 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
index 9db87c3..773f109 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
@@ -152,7 +152,7 @@
nodeService.updateBatchById(historyProgramPackageNodes);
Machine machine = machineService.getByCode(cureNode.getMachineCode());
- List<DictBiz> annoDicts = programAnnotationService.getAnnotionList();
+ List<DictBiz> annoDicts = programAnnotationService.getAnnotionDictList();
//鏂扮殑娴佺▼鏂囦欢锛岄渶瑕佸湪鍖呰妭鐐逛笅鏂板缓锛屼笉鑳界敤鑰佺殑
List<FlowProgramFile> files = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId,pkgNode1.getProcessInstanceId()).list();
for(FlowProgramFile flowProgramFile : files){
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java
index b89f938..5d5b936 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java
@@ -2,10 +2,7 @@
package org.springblade.mdm.flow.service;
import com.itextpdf.text.*;
-import com.itextpdf.text.pdf.BaseFont;
-import com.itextpdf.text.pdf.PdfPCell;
-import com.itextpdf.text.pdf.PdfPTable;
-import com.itextpdf.text.pdf.PdfWriter;
+import com.itextpdf.text.pdf.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.HistoryService;
@@ -25,11 +22,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.util.Date;
+import java.util.*;
import java.util.List;
-import java.util.Optional;
/**
* 鏁版帶绋嬪簭纭琛ㄨ緭鍑烘湇鍔�
@@ -64,7 +62,68 @@
BaseFont bfChinese = getBaseFont();
return new Font(bfChinese, 12, Font.NORMAL);
}
+ public void generateTempPDF()throws Exception {
+ PdfReader reader = null;
+ PdfStamper ps = null;
+ OutputStream fos = null;
+ ByteArrayOutputStream bos = null;
+ try {
+ String fileName = "d:/qrb.pdf";//妯℃澘缁濆璺緞
+ reader = new PdfReader(fileName);
+ bos = new ByteArrayOutputStream();
+ ps = new PdfStamper(reader, bos);
+ // 浣跨敤涓枃瀛椾綋
+ //BaseFont bf = BaseFont.createFont("sTsong-Light", "uniGB-Ucs2-H", BaseFont.NOT_EMBEDDED);
+ BaseFont bf = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
+ ArrayList<BaseFont> fontList = new ArrayList<BaseFont>();
+ fontList.add(bf);
+ AcroFields fields = ps.getAcroFields();
+ fields.setSubstitutionFonts(fontList);
+ fillData(fields, data());//鏌�
+ //蹇呴』瑕佽皟鐢ㄨ繖涓紝鍚﹀垯鏂囨。涓嶄細鐢熸垚鐨�
+ ps.setFormFlattening(true);
+ if (ps != null) {
+ ps.close();
+ }
+ //鐢熸垚pdf璺緞瀛樻斁鐨勮矾寰�
+ fos = new FileOutputStream("d:/bb2.pdf");
+ fos.write(bos.toByteArray());
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ if (fos != null) {
+ fos.flush();
+ fos.close();
+ if (bos != null) {
+ bos.close();
+ }
+ if (reader != null) {
+ reader.close();
+ }
+ }
+ }
+ }
+
+ public void fillData(AcroFields fields, Map<String, String> data) {
+ try {
+ for (String key : data.keySet()) {
+ String value = data.get(key);
+ // 涓哄瓧娈佃祴鍊�,娉ㄦ剰瀛楁鍚嶇О鏄尯鍒嗗ぇ灏忓啓鐨刦ields.setField(key,value);
+ fields.setField(key,value);
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+
+ }
+ }
+ Map<String,String> data(){
+ Map<String,String> ret = new HashMap<>();
+ ret.put("drawingName","涓枃鍥惧悕");
+
+ ret.put("craftEdition","TH0001");
+ return ret;
+ }
public void exportConfirmTable(String processInstanceId, OutputStream os) throws DocumentException, IOException {
BaseFont bfChinese = getBaseFont();
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java
index 5db58b1..051f900 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java
@@ -67,7 +67,7 @@
LocalDateTime checkStartDate = LocalDateTime.now().minusDays(taskDupDays);
LambdaQueryChainWrapper<TaskDispatch> q = lambdaQuery().eq(TaskDispatch::getDrawingNo,startVO.getDrawingNo())
.eq(TaskDispatch::getProcessNo,startVO.getProcessNo())
- .eq(TaskDispatch::getProcessEdition,startVO.getProcessEdition())
+ //.eq(TaskDispatch::getProcessEdition,startVO.getProcessEdition())
.eq(TaskDispatch::getMachineCode,startVO.getMachineCode())
.gt(TaskDispatch::getCreateTime,checkStartDate);
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
index 9318958..29b2d15 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
@@ -255,11 +255,11 @@
if (matchedMachine != null) {
vo.setName(parseProgramName(vo.getFilename()));
vo.setMachineCode(matchedMachine.getCode());
- //String sendPath = programAnnotationService.removeAnnotation(matchedMachine.getMachineGroupCode(),line1,"(",")");
+
vo.setFullPath(path.toString());//鏂囦欢鍦板潃
vo.setSendPath(matchedMachine.getProgSendDir());
vo.setId(vo.getFullPath());
- vo.setProgramStatus(programAnnotationService.removeAnnotation(matchedMachine.getMachineGroupCode(),line2,"(",")"));
+ vo.setProgramStatus(programAnnotationService.removeAnnotation(matchedMachine.getMachineGroupCode(),line2));
list.add(vo);
}
@@ -267,17 +267,9 @@
} catch (IOException e) {
log.error("璇诲彇鏂囦欢md5澶辫触",e);
}
-
-
- //List<String> files = new ArrayList<>();
-
-
- // 杩欓噷鍙互娣诲姞瀵规枃浠剁殑澶勭悊閫昏緫
}
}
}
-
-
return list;
}
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 a3c8207..5429e1e 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
@@ -104,7 +104,7 @@
deviationSerial = ncNodeService.getDeviationSerialForNode(packageNode);
}
- List<DictBiz> annotationDictList= programAnnotationService.getAnnotionList();
+ List<DictBiz> annotationDictList= programAnnotationService.getAnnotionDictList();
for (NcNode node : programNodes) {
String filePathInZip = genFilePathInZip(packageFolder,node,deviationSerial);
programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
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..5bcd37e 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,44 @@
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 String removeAnnotation(String machineGroupCode,String text){
+ List<DictBiz> annoDicts = getAnnotionDictList();
+ ProgramAnnotation panno = this.getProgramAnnotationFormat(machineGroupCode,annoDicts);
+ //String[] arr = getAnnotationStartAndEnd(machineGroupCode,annoDicts);
+ 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 +200,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 +209,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 +234,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;
+ }
}
+
+
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/ProgramAnnotation.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/ProgramAnnotation.java
new file mode 100644
index 0000000..b40d5f7
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/ProgramAnnotation.java
@@ -0,0 +1,43 @@
+package org.springblade.mdm.program.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 绋嬪簭娉ㄩ噴
+ */
+@Getter
+@Setter
+public class ProgramAnnotation {
+ /**
+ * 娉ㄩ噴寮�濮�
+ */
+ private String begin;
+ /**
+ * 娉ㄩ噴缁撴潫
+ */
+ private String end;
+
+ /**
+ * 鍒ゆ柇鏂囨湰鏄惁鏄敞閲�
+ * @param text 寰呭垽鏂枃鏈�
+ * @return 鐭充經iu
+ */
+ public boolean isAnnotation(String text){
+ return StringUtils.startsWith(text,this.begin) && StringUtils.endsWith(text,this.end);
+ }
+
+ /**
+ * 鐢熻景娉ㄩ噴
+ * @param oriTest 鍘熷鏂囨湰
+ * @return 鍔犱笂娉ㄩ噴鍚庣殑鏂囨湰
+ */
+ public String addAnnotation(String oriTest) {
+ return begin + oriTest + end;
+ }
+
+ public String cleanAnnotation(String annotatedText){
+ return StringUtils.removeEnd(StringUtils.removeStart(annotatedText,begin),end);
+ }
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java
index cb10c8a..d786e24 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java
@@ -90,7 +90,7 @@
BladeFile bfile = ossTemplate.putFile("replaceok.txt",newins);
return R.data(bfile.getLink()+","+bfile.getName());
}
-
+ /*
@GetMapping("/replace2")
@ApiOperationSupport(order = 2)
@Operation(summary = "鏇挎崲鍐呭2")
@@ -122,14 +122,14 @@
//flowProgramFile.setOssName(bfile.getName());
}
}
- /*
+
InputStream ins = ossTemplate.statFileStream(ossName);
InputStream newins = FileContentUtil.replaceAtLine(fis,2,"GHTEST");
BladeFile bfile = ossTemplate.putFile("replaceok.txt",newins);
- */
+
return R.data(bfile.getLink()+","+bfile.getName());
}
-
+*/
}
diff --git a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/ProgramConfirmTableServiceTest.java b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/ProgramConfirmTableServiceTest.java
index 046bcab..c6a78ba 100644
--- a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/ProgramConfirmTableServiceTest.java
+++ b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/ProgramConfirmTableServiceTest.java
@@ -2,68 +2,32 @@
import com.itextpdf.text.Document;
import com.itextpdf.text.PageSize;
-import com.itextpdf.text.pdf.BaseFont;
-import com.itextpdf.text.pdf.PdfWriter;
+import com.itextpdf.text.pdf.*;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.flow.vo.ApproveTableInfo;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
public class ProgramConfirmTableServiceTest {
@Test
- public void testExportConfirmTable(){
+ public void test(){
ProgramConfirmTableService s = new ProgramConfirmTableService();
try {
- BaseFont bfChinese = s.getBaseFont();
-
- Document document = new Document(PageSize.B5.rotate());
-
- String filename = "c"+System.currentTimeMillis()+".pdf";
- File pdf = new File(filename);
- if(pdf.exists()){
- pdf.delete();
- }
- PdfWriter.getInstance(document,new FileOutputStream(pdf));
-
- document.open();
-
- FlowProgramProperties props = new FlowProgramProperties();
- props.setDrawingNo("CP3-1");
- props.setProcessNo("A");
- props.setProcessEdition("93");
- props.setCraftEdition("宸ヨ壓鐗堟");
- props.setProductModel("CP3");
- //缂栧埗
-
- Machine machine = new Machine();
- machine.setName("1075");
- machine.setProgSendDir("d:\\mdm\\send");
-
- ApproveTableInfo appInfo = new ApproveTableInfo();
- appInfo.setTeamLeaderName("缁勯暱1");
- appInfo.setProgrammerName("缂栧埗1");
- appInfo.setCheckerName("鏍″1");
- appInfo.setSeniorName("瀹℃牳1");
-
-
- Calendar startCal = Calendar.getInstance();
- startCal.add(Calendar.DAY_OF_MONTH, -5);
- appInfo.setProgrammingDate(startCal.getTime());
-
- startCal.add(Calendar.DAY_OF_MONTH, 2);
- appInfo.setCheckDate(startCal.getTime());
-
-
- startCal.add(Calendar.DAY_OF_MONTH, 2);
- appInfo.setApproveDate(startCal.getTime());
- s.printPage(document,bfChinese,props,machine);
-
- document.close();
+ s.generateTempPDF();
+ Assertions.assertTrue(true);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
+
+
}
--
Gitblit v1.9.3