diff --git a/pom.xml b/pom.xml
index c8da093..47ab067 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,18 +221,6 @@
${lombok.version}
provided
-
-
- javax.media
- jai-core
- ${jai.version}
-
-
-
- com.sun.media
- jai-codec
- ${jai.version}
-
org.hibernate.validator
diff --git a/src/main/java/com/emr/controller/ImageController.java b/src/main/java/com/emr/controller/ImageController.java
index 8134961..d7bac67 100644
--- a/src/main/java/com/emr/controller/ImageController.java
+++ b/src/main/java/com/emr/controller/ImageController.java
@@ -1,16 +1,11 @@
package com.emr.controller;
import com.emr.util.ExceptionPrintUtil;
-import com.sun.media.jai.codec.ImageCodec;
-import com.sun.media.jai.codec.ImageEncoder;
-import com.sun.media.jai.codec.JPEGEncodeParam;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import javax.imageio.ImageIO;
-import javax.media.jai.JAI;
-import javax.media.jai.RenderedOp;
import javax.servlet.http.HttpServletResponse;
import java.awt.*;
import java.io.*;
@@ -44,7 +39,7 @@ public class ImageController{
boolean flag = checkJpg(file);
if (!flag) {
//tif转jpg输出到前台
- tiffTuanJPG(response.getOutputStream(), file);
+ //tiffTuanJPG(response.getOutputStream(), file);
} else {
//图片读取路径
in=new FileInputStream(file);
@@ -70,7 +65,7 @@ public class ImageController{
return false;
}
}
- private static void tiffTuanJPG(OutputStream out,File fileTiff){
+ /*private static void tiffTuanJPG(OutputStream out,File fileTiff){
String filePath = fileTiff.getAbsolutePath();
RenderedOp rd = JAI.create("fileload", filePath);//读取iff文件
try {
@@ -84,5 +79,5 @@ public class ImageController{
ExceptionPrintUtil.printException(e);
e.printStackTrace();
}
- }
+ }*/
}
diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java
index efee90d..98202f8 100644
--- a/src/main/java/com/emr/service/CommomService.java
+++ b/src/main/java/com/emr/service/CommomService.java
@@ -13,7 +13,6 @@ import com.emr.service.tScanAssort.T_Scan_AssortService;
import com.emr.util.img2PdfUtil;
import com.emr.vo.User;
import com.emr.vo.commomSearch.CommomVo;
-import com.sun.media.jai.codec.*;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
@@ -28,8 +27,6 @@ import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
-import javax.media.jai.JAI;
-import javax.media.jai.RenderedOp;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
@@ -519,7 +516,7 @@ public class CommomService {
//组织加水印后图片存放地址
picPath = picSrc + nameList[i];
//转换图片输出
- tifToJpg(srcPath,picPath);
+ //tifToJpg(srcPath,picPath);
outSrc = EMRRECORDJSP + File.separator + "reload" + File.separator + patientId + File.separator + sourceList[i] + File.separator + nameList[i];
}else{
//将原图片地址转换成映射地址
@@ -564,7 +561,7 @@ public class CommomService {
return false;
}
- private static String tifToJpg(String tifUrl, String tifToJpgRoot) {
+ /*private static String tifToJpg(String tifUrl, String tifToJpgRoot) {
File fileTiff = new File(tifToJpgRoot);
if (fileTiff.exists()) {
return tifToJpgRoot;
@@ -585,7 +582,7 @@ public class CommomService {
e.printStackTrace();
}
return tifToJpgRoot;
- }
+ }*/
/**
diff --git a/src/main/java/com/emr/util/img2PdfUtil.java b/src/main/java/com/emr/util/img2PdfUtil.java
index 9dd4c8b..227e359 100644
--- a/src/main/java/com/emr/util/img2PdfUtil.java
+++ b/src/main/java/com/emr/util/img2PdfUtil.java
@@ -8,16 +8,11 @@ import com.itextpdf.text.pdf.PdfWriter;
import com.lowagie.text.DocumentException;
import com.lowagie.text.Element;
import com.lowagie.text.pdf.*;
-import com.sun.media.jai.codec.ImageCodec;
-import com.sun.media.jai.codec.ImageEncoder;
-import com.sun.media.jai.codec.JPEGEncodeParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.imageio.ImageIO;
-import javax.media.jai.JAI;
-import javax.media.jai.RenderedOp;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.awt.*;
diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties
index f17d567..2e7110a 100644
--- a/src/main/resources/config/jdbc.properties
+++ b/src/main/resources/config/jdbc.properties
@@ -3,11 +3,11 @@ jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
#jdbc.username=sa
#jdbc.password=docus@702
-jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=qf_record
+jdbc.url=jdbc\:sqlserver\://47.111.21.195:1433;databaseName=qf_record1
jdbc.username=sa
-jdbc.password=docus702
+jdbc.password=docus@702
#dataSource2
-jdbc.url2=jdbc\:sqlserver\://localhost:1433;databaseName=blgd_java
+jdbc.url2=jdbc\:sqlserver\://47.111.21.195:1433;databaseName=blgd_java
jdbc.username2=sa
-jdbc.password2=docus702
+jdbc.password2=docus@702