diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java
index 6294d314..305981af 100644
--- a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java
+++ b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java
@@ -14,6 +14,24 @@ public class DocConverterPdf {
private static final Logger logger = LoggerFactory.getLogger(DocConverterPdf.class);
+ /**
+ * 在所需的类里 添加下面配置
+ * // 文档转换远程服务IP地址
+ * @Value("${convert.host}")
+ * private String convertHost;
+ *
+ *
+ * fileString : 新替换的文件名
+ * fileType : 文件后缀类型
+ * 调用方法如下
+ * DocConverterPdf d = new DocConverterPdf(fileString,fileType);
+ * d.setConvertHost(convertHost);
+ * //调用conver方法开始转换
+ * File getPdf = d.conver(fileType);
+ *
+ *
+ */
+
private static final int ENVIRONMENT = 1;// 环境 1:windows 2:linux
private String fileString;// (只涉及pdf2swf路径问题)
private String outputPath = "";// 输入路径 ,如果不设置就输出在默认的位置
diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties
index 27bb37f1..d39b475a 100644
--- a/adc-da-main/src/main/resources/application.properties
+++ b/adc-da-main/src/main/resources/application.properties
@@ -147,3 +147,7 @@ elasticsearch.ip=172.17.0.1
elasticsearch.port=9300
elasticsearch.poolSize=5
elas.flag=true
+
+# 文档转换TCP通讯地址
+convert.host=127.0.0.1
+#convert.host=0.0.0.0
diff --git a/adc-da-slrs/pom.xml b/adc-da-slrs/pom.xml
index cb647b83..298c958a 100644
--- a/adc-da-slrs/pom.xml
+++ b/adc-da-slrs/pom.xml
@@ -23,6 +23,12 @@
3.0.0
compile
+
+ com.adc
+ adc-da-convert
+ 3.0.0
+ compile
+
net.sf.json-lib
json-lib
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
index b4601b3a..908b96b3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
@@ -102,6 +102,13 @@ public class SarBussionessStand extends BaseEntity {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
+ // 新添加字段
+ @ApiModelProperty(value = "文本状态")
+ @TableField("TEXT_STATUS_BUSS")
+ private String textStatusBuss;
+
+
+ // 非表字段
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private String firstPutTime;