diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 4665a006..8fbc7ffa 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,8 +3,8 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -#spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false -spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +#spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root @@ -12,7 +12,7 @@ spring.datasource.password = root #============================================== # 应用设置 -spring.application.name=FotonLAWSSystem +spring.application.name=FotonLAWSSystem-w application.code=20200101 application.center=1 #============================================== @@ -44,10 +44,10 @@ spring.mail.port=587 #spring.rabbitmq.username=uat_pcms #spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true -spring.rabbitmq.host=62.234.118.181 +spring.rabbitmq.host=62.234.136.153 spring.rabbitmq.port=5672 -spring.rabbitmq.username=admin -spring.rabbitmq.password=admin +spring.rabbitmq.username=guest +spring.rabbitmq.password=guest spring.rabbitmq.listener.simple.acknowledge-mode= manual #消费失败消息干掉 spring.rabbitmq.listener.simple.default-requeue-rejected= true diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java index 18b5d117..624baec3 100644 --- a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java @@ -32,6 +32,10 @@ import org.springframework.web.multipart.MultipartFile; import com.adc.da.sys.util.LoginUserUtil; import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; @@ -155,17 +159,24 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { //首先将文件保存至本地 String saveWordFilePath=null; String saveWordFileName=null; + logger.info("将文件保存至本地"); if(wordFile!=null && !wordFile.isEmpty()){ saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename(); saveWordFilePath=ocrFilePath+saveWordFileName; - FileUtils.copyInputStreamToFile(wordFile.getInputStream(),new File(saveWordFilePath)); + logger.info(saveWordFilePath); + //FileUtils.copyInputStreamToFile(wordFile.getInputStream(),new File(saveWordFilePath)); + savePic(wordFile.getInputStream(),saveWordFilePath); + logger.info("word存储完成"); } String saveJsonFilePath=null; String saveJsonFileName=null; if(jsonFile!=null && !jsonFile.isEmpty()){ saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename(); saveJsonFilePath=ocrFilePath+saveJsonFileName; - FileUtils.copyInputStreamToFile(jsonFile.getInputStream(),new File(saveJsonFilePath)); + logger.info(saveJsonFilePath); + //FileUtils.copyInputStreamToFile(jsonFile.getInputStream(),new File(saveJsonFilePath)); + savePic(jsonFile.getInputStream(),saveJsonFilePath); + logger.info("Json存储完成"); } //开始将文件保存至数据库中 if(StringUtils.isNotEmpty(saveWordFilePath) && StringUtils.isNotEmpty(saveJsonFilePath)){ @@ -186,4 +197,40 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { return "{\"result\":\"error:File does not exist\"}";//文件不存在 } } + + private void savePic(InputStream inputStream, String filePath) { + + OutputStream os = null; + try { + // 2、保存到临时文件 + // 1K的数据缓冲 + byte[] bs = new byte[1024]; + // 读取到的数据长度 + int len; + // 输出的文件流保存到本地文件 + + File tempFile = new File(ocrFilePath); + if (!tempFile.exists()) { + tempFile.mkdirs(); + } + os = new FileOutputStream(filePath); + // 开始读取 + while ((len = inputStream.read(bs)) != -1) { + os.write(bs, 0, len); + } + + } catch (IOException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } finally { + // 完毕,关闭所有链接 + try { + os.close(); + inputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } }