Commit 9dfa2af4 authored by wangqiang's avatar wangqiang

ExtPlanController:业务代码迁入(2.x版本->4.1版本)--已全部编译通过

parent c41d2718
...@@ -50,6 +50,19 @@ ...@@ -50,6 +50,19 @@
<artifactId>dex-basic-service-common</artifactId> <artifactId>dex-basic-service-common</artifactId>
<version>4.1-RELEASE</version> <version>4.1-RELEASE</version>
</dependency> </dependency>
<dependency>
<groupId>com.jacob</groupId>
<artifactId>jacob</artifactId>
<version>1.19</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/jacob.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.24</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
......
...@@ -2,17 +2,20 @@ package com.yonde.dcs.plan.common.utils; ...@@ -2,17 +2,20 @@ package com.yonde.dcs.plan.common.utils;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import com.inet.pdm.constants.Constants;
import com.jacob.activeX.ActiveXComponent; import com.jacob.activeX.ActiveXComponent;
import com.jacob.com.Dispatch; import com.jacob.com.Dispatch;
import com.jacob.com.Variant; import com.jacob.com.Variant;
import com.yonde.dcs.document.common.entity.vo.DxDocumentVO; import com.yonde.dcs.document.common.entity.vo.DxDocumentVO;
import com.yonde.dcs.plan.common.constants.Constants;
import com.yonde.dex.basedata.entity.data.OperatorType; import com.yonde.dex.basedata.entity.data.OperatorType;
import com.yonde.dex.basedata.entity.vo.IdVO; import com.yonde.dex.basedata.entity.vo.IdVO;
import com.yonde.dex.valut.handler.ContentHolder;
import com.yonde.dex.valut.vo.ObjFileLinkVO; import com.yonde.dex.dfs.handler.ContentHolder;
import com.yonde.dex.dfs.vo.ObjFileLinkVO;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.pdfbox.io.MemoryUsageSetting; import org.apache.pdfbox.io.MemoryUsageSetting;
import org.apache.pdfbox.multipdf.PDFMergerUtility; import org.apache.pdfbox.multipdf.PDFMergerUtility;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
......
...@@ -269,6 +269,11 @@ public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<E ...@@ -269,6 +269,11 @@ public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<E
*/ */
private String verifier; private String verifier;
/**
* 密级
*/
private String secretCode;
} }
...@@ -3,6 +3,7 @@ package com.yonde.dcs.plan.common.vo; ...@@ -3,6 +3,7 @@ package com.yonde.dcs.plan.common.vo;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
/** /**
...@@ -63,13 +64,13 @@ public class PlanExcelVO implements Serializable { ...@@ -63,13 +64,13 @@ public class PlanExcelVO implements Serializable {
/** /**
* 开始时间 * 开始时间
*/ */
private Date startTime; private LocalDateTime startTime;
/** /**
* 完成时间 * 完成时间
*/ */
private Date completeTime; private LocalDateTime completeTime;
/** /**
* 文件分类 * 文件分类
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment