diff --git a/adc-da-convert/pom.xml b/adc-da-convert/pom.xml
index a79a4e71..cd99fdf3 100644
--- a/adc-da-convert/pom.xml
+++ b/adc-da-convert/pom.xml
@@ -10,141 +10,18 @@
4.0.0
adc-da-convert
-
- UTF-8
- UTF-8
- 1.7
- 1.7
- 1.7
- 4.3.9.RELEASE
- 3.4.0
- 1.4.0-RC2
- 4.1.2
-
-
-
-
- adc
- http://60.247.58.121:8182/nexus/content/groups/public
-
- true
-
-
- true
-
-
-
-
-
-
-
- thirdparty
- Nexus Thirdparty Repository
- http://60.247.58.121:8182/nexus/content/repositories/thirdparty/
-
-
com.adc
adc-da-base
- 2.0.0
+ 3.0.0
com.adc
adc-da-sys
3.0.0
-
- com.adc
- adc-da-util
- 2.2.4
-
-
- org.bouncycastle
- bcprov-jdk14
-
-
-
-
- org.springframework
- spring-tx
- ${spring.version}
-
-
- org.springframework
- spring-web
- ${spring.version}
-
-
- org.mybatis
- mybatis
- ${mybatis.version}
-
-
- javax.validation
- validation-api
- 2.0.1.Final
-
-
-
- org.apache.shiro
- shiro-core
- ${shiro.version}
-
-
-
- com.adc
- adc-da-excel
- 2.0.0
-
-
-
- org.apache.poi
- poi
- ${poi.version}
-
-
- org.apache.poi
- poi-ooxml
- ${poi.version}
-
-
- org.apache.poi
- poi-ooxml-schemas
- ${poi.version}
-
-
- org.apache.poi
- poi-scratchpad
- ${poi.version}
- true
-
-
-
-
-
- com.adc
- adc-da-file
- RELEASE
-
-
- com.adc
- adc-da-file
- 2.0.0
-
-
-
-
- com.servlets
- cos
- 05Nov2002
-
-
com.artofsolving
jodconverter
@@ -167,22 +44,11 @@
ridl
3.0.1
-
- org.slf4j
- slf4j-jdk14
- 1.7.21
- test
-
org.openoffice
unoil
3.0.1
-
- com.thoughtworks.xstream
- xstream
- 1.3.1
-
@@ -217,27 +83,12 @@
7.0.4
- org.slf4j
- slf4j-log4j12
- 1.7.18
+ org.dom4j
+ dom4j
+ 2.0.0
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- ${java.version}
- ${java.version}
- ${java.version}
- ${project.build.sourceEncoding}
-
-
-
-
-
\ No newline at end of file
diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/controller/OtConvertController.java b/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/controller/OtConvertController.java
new file mode 100644
index 00000000..a43c7ad7
--- /dev/null
+++ b/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/controller/OtConvertController.java
@@ -0,0 +1,46 @@
+package com.adc.da.convert.OtConvert.controller;
+
+
+import com.adc.da.att.entity.AttFileEO;
+import com.adc.da.convert.mq.CreateConvertMQService;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.convert.OtConvert.entity.OtConvert;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+*
+ * 流程文档转换记录表 前端控制器
+ *
+*
+* @author super_liu
+* @since 2021-08-12
+*/
+@RestController
+@Api(tags = "|OtConvert| 文档转换")
+@RequestMapping("/OtConvert")
+public class OtConvertController extends BaseController {
+
+ @Autowired
+ private CreateConvertMQService createConvertMQService;
+
+ /**
+ * @Author super_liu
+ * @Description 查询文件信息
+ * Date 2018/10/10 18:41
+ * @Param [fileId]
+ * @return com.adc.da.util.http.ResponseMessage
+ **/
+ @ApiOperation(value = "|File|查询文件信息")
+ @GetMapping("/OtConvert")
+ public ResponseMessage getAttFileInfo(AttFileEO attFileEO){
+ createConvertMQService.sendConvertMQ(attFileEO);
+ return Result.success("");
+ }
+}
diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/dao/OtConvertDao.java b/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/dao/OtConvertDao.java
new file mode 100644
index 00000000..736f8ebd
--- /dev/null
+++ b/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/dao/OtConvertDao.java
@@ -0,0 +1,16 @@
+package com.adc.da.convert.OtConvert.dao;
+
+import com.adc.da.convert.OtConvert.entity.OtConvert;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 流程文档转换记录表 Mapper 接口
+ *
+ *
+ * @author super_liu
+ * @since 2021-08-12
+ */
+public interface OtConvertDao extends BaseMapper {
+
+}
diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/entity/OtConvert.java b/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/entity/OtConvert.java
new file mode 100644
index 00000000..a6f90a3c
--- /dev/null
+++ b/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/entity/OtConvert.java
@@ -0,0 +1,66 @@
+package com.adc.da.convert.OtConvert.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ *
+ * 流程文档转换记录表
+ *
+ *
+ * @author super_liu
+ * @since 2021-08-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="OtConvert对象", description="流程文档转换记录表")
+public class OtConvert extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId("ID")
+ private String id;
+
+ @ApiModelProperty(value = "待转换文件ID")
+ @TableField("ACT_FILE_ID")
+ private String actFileId;
+
+ @ApiModelProperty(value = "转换状态:LODING:待转换 SUCCESS:成功 ERROR:错误")
+ @TableField("CONVERT_STATE")
+ private String convertState;
+
+ @ApiModelProperty(value = "转换后文件ID")
+ @TableField("CONVERT_FILE_ID")
+ private String convertFileId;
+
+ @ApiModelProperty(value = "数据创建时间")
+ @TableField("CREATE_TIME")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty(value = "数据修改时间")
+ @TableField("MODIFY_TIME")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+
+ @ApiModelProperty(value = "是否有效")
+ @TableField("VALID_FLAG")
+ private Integer validFlag;
+
+
+}
diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/service/IOtConvertService.java b/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/service/IOtConvertService.java
new file mode 100644
index 00000000..5533a728
--- /dev/null
+++ b/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/service/IOtConvertService.java
@@ -0,0 +1,16 @@
+package com.adc.da.convert.OtConvert.service;
+
+import com.adc.da.convert.OtConvert.entity.OtConvert;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 流程文档转换记录表 服务类
+ *
+ *
+ * @author super_liu
+ * @since 2021-08-12
+ */
+public interface IOtConvertService extends IService {
+
+}
diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/service/impl/OtConvertServiceImpl.java b/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/service/impl/OtConvertServiceImpl.java
new file mode 100644
index 00000000..f873f1a6
--- /dev/null
+++ b/adc-da-convert/src/main/java/com/adc/da/convert/OtConvert/service/impl/OtConvertServiceImpl.java
@@ -0,0 +1,20 @@
+package com.adc.da.convert.OtConvert.service.impl;
+
+import com.adc.da.convert.OtConvert.entity.OtConvert;
+import com.adc.da.convert.OtConvert.dao.OtConvertDao;
+import com.adc.da.convert.OtConvert.service.IOtConvertService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 流程文档转换记录表 服务实现类
+ *
+ *
+ * @author super_liu
+ * @since 2021-08-12
+ */
+@Service
+public class OtConvertServiceImpl extends ServiceImpl implements IOtConvertService {
+
+}
diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverter.java b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverter.java
index 30d1d95e..5febe5de 100644
--- a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverter.java
+++ b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverter.java
@@ -4,7 +4,6 @@ import com.artofsolving.jodconverter.DocumentConverter;
import com.artofsolving.jodconverter.openoffice.connection.OpenOfficeConnection;
import com.artofsolving.jodconverter.openoffice.connection.SocketOpenOfficeConnection;
import com.artofsolving.jodconverter.openoffice.converter.OpenOfficeDocumentConverter;
-import com.itextpdf.kernel.pdf.PdfReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/mq/CreateConvertMQService.java b/adc-da-convert/src/main/java/com/adc/da/convert/mq/CreateConvertMQService.java
new file mode 100644
index 00000000..0a01541f
--- /dev/null
+++ b/adc-da-convert/src/main/java/com/adc/da/convert/mq/CreateConvertMQService.java
@@ -0,0 +1,27 @@
+package com.adc.da.convert.mq;
+
+import com.adc.da.att.entity.AttFileEO;
+import net.sf.json.JSONObject;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class CreateConvertMQService {
+ @Autowired
+ private AmqpTemplate rabbitTemplate;
+
+ /**
+ *
+ * @param attFileEO 文件对象
+ * @throws Exception
+ */
+ public void sendConvertMQ(AttFileEO attFileEO){
+ // 中间转换业务逻辑
+ //发送消息队列
+ this.rabbitTemplate.convertAndSend("convert-exchange_SQ_GSAR", "convert-key_SQ_GSAR", attFileEO);
+ }
+}
diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java
new file mode 100644
index 00000000..a8ead8d3
--- /dev/null
+++ b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java
@@ -0,0 +1,63 @@
+package com.adc.da.convert.mq;
+
+import com.adc.da.att.entity.AttFileEO;
+import com.adc.da.att.service.IAttFileEOService;
+import com.rabbitmq.client.Channel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.annotation.Exchange;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.QueueBinding;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.support.AmqpHeaders;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.messaging.Message;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SendConvertMQService {
+
+ // 文档转换远程服务IP地址
+ @Value("${convert.host}")
+ private String convertHost;
+
+ @Autowired
+ private IAttFileEOService iAttFileEOService;
+
+ private static final Logger logger = LoggerFactory.getLogger(SendConvertMQService.class);
+
+ @RabbitListener(bindings = @QueueBinding(
+ value = @Queue(value = "createStandMQ_SQ_GSAR", durable = "true"),
+ exchange = @Exchange(value = "convert-exchange_SQ_GSAR", ignoreDeclarationExceptions = "true"),
+ key = "convert-key_SQ_GSAR"))
+ public void createMQ(AttFileEO attFileEO, Message message, Channel channel) throws Exception{
+ try{
+ try{
+ Thread.sleep(5000);
+ insertOrUpdateStandInfo(attFileEO);
+ }catch(InterruptedException e){
+ logger.error(e.toString());
+ Thread.currentThread().interrupt();
+ }
+ } catch (Exception e) {
+ logger.error("文档转换消息队列进入添加数据方法前失败!");
+ logger.error(e.getMessage(),e);
+ }finally {
+ Long tag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG);
+ channel.basicAck(tag,false);
+ logger.debug("文档转换消息确认成功!!!!!!!!!");
+ }
+
+ }
+
+ /**
+ * 文档转换逻辑
+ * @param attFileEO
+ */
+ public void insertOrUpdateStandInfo(AttFileEO attFileEO){
+
+ }
+
+
+}
diff --git a/adc-da-convert/src/main/resources/mybatis/mapper/OtConvert/OtConvertMapper.xml b/adc-da-convert/src/main/resources/mybatis/mapper/OtConvert/OtConvertMapper.xml
new file mode 100644
index 00000000..b7f1df3f
--- /dev/null
+++ b/adc-da-convert/src/main/resources/mybatis/mapper/OtConvert/OtConvertMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/adc-da-main/pom.xml b/adc-da-main/pom.xml
index cb376f0d..cf4b3bc8 100644
--- a/adc-da-main/pom.xml
+++ b/adc-da-main/pom.xml
@@ -24,6 +24,11 @@
org.springframework.boot
spring-boot-starter
+
+ com.adc
+ adc-da-convert
+ 3.0.0
+
com.adc
adc-da-slrs