commit

ZSKK_DicomServer/pom.xml

@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.zskk</groupId>
 	<artifactId>ZSKK_DicomServer</artifactId>
@@ -39,42 +37,52 @@
 			<artifactId>mysql-connector-java</artifactId>
 			<version>8.0.18</version>
 		</dependency>
-		<dependency>
+		 <dependency>
+			<groupId>com.microsoft.sqlserver</groupId>
+			<artifactId>mssql-jdbc</artifactId>
+			<version>7.4.1.jre11</version>
+			<scope>test</scope>
+		</dependency> 
+		 <dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 			<version>4.0.1</version>
 			<scope>provided</scope>
-		</dependency>
-		<dependency>
+		</dependency> 
+		<!-- <dependency>
 			<groupId>com.jfinal</groupId>
 			<artifactId>jetty-server</artifactId>
 			<version>2019.3</version>
 			<scope>provided</scope>
-		</dependency>
-
+		</dependency> -->
 		<dependency>
 			<groupId>org.dcm4che</groupId>
 			<artifactId>dcm4che-core</artifactId>
-			<version>5.19.1</version>
+			<version>5.22.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.dcm4che</groupId>
 			<artifactId>dcm4che-net</artifactId>
-			<version>5.19.1</version>
+			<version>5.22.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.dcm4che.tool</groupId>
 			<artifactId>dcm4che-tool-common</artifactId>
-			<version>5.19.1</version>
+			<version>5.22.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
-			<version>4.2.2</version>
+			<version>4.7.2</version>
 		</dependency>
+		<dependency>
+    <groupId>com.microsoft.sqlserver</groupId>
+    <artifactId>mssql-jdbc</artifactId>
+    <version>8.2.2.jre11</version>
+</dependency>
 	</dependencies>
 	<build>
-		<finalName>zskk_dicomserver_v3.0</finalName>
+		<finalName>zskk_dicomserver_v3.0.1</finalName>
 		<plugins>
 			<plugin>
 				<artifactId>maven-war-plugin</artifactId>
@@ -85,8 +93,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.1</version>
 				<configuration>
-					<source>${jdk.version}</source>
-					<target>${jdk.version}</target>
+					<source>11</source>
+					<target>11</target>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -104,4 +112,4 @@
 			</snapshots>
 		</repository>
 	</repositories>
-</project>
+</project>

ZSKK_DicomServer/src/main/java/com/zskk/common/ZskkConfig.java

@@ -16,6 +16,7 @@ import com.jfinal.core.JFinal;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
+import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.template.Engine;
 import com.zskk.controller.DicomController;
@@ -55,17 +56,30 @@ public class ZskkConfig extends JFinalConfig {
 		return new DruidPlugin(PropKit.get("jdbcUrl_zskk"), PropKit.get("user_zskk"),
 				PropKit.get("password_zskk").trim());
 	}
+	public static DruidPlugin createConnDruidPlugin() {
+
+		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),
+				PropKit.get("password_connected").trim());
+	}
 
 	public void configPlugin(Plugins me) {
 		// 配置数据库连接池插件
 //		DruidPlugin druidPluginZskk = createZskkDruidPlugin();
 //		me.add(druidPluginZskk);
-		// 配置ActiveRecord插件
+//		// 配置ActiveRecord插件
 //		ActiveRecordPlugin arpZskk = new ActiveRecordPlugin(druidPluginZskk);
 //		arpZskk.setDialect(new MysqlDialect());
-    	//所有映射在 MappingKit 中自动化搞定
+//    	//所有映射在 MappingKit 中自动化搞定
 //		_MappingKit.mapping(arpZskk);
 //		me.add(arpZskk);
+		
+		DruidPlugin druidPluginconn = createConnDruidPlugin();
+		me.add(druidPluginconn);
+		// 配置ActiveRecord插件
+		ActiveRecordPlugin arpconnActiveRecordPlugin = new ActiveRecordPlugin("connected", druidPluginconn);
+		arpconnActiveRecordPlugin.setDialect(new SqlServerDialect());
+		me.add(arpconnActiveRecordPlugin);
+
 	}
 
 	public void configInterceptor(Interceptors me) {
@@ -89,9 +103,9 @@ public class ZskkConfig extends JFinalConfig {
 	/*
 	 * / 本地调试运行此处，线上发布注释main方法，并在maven配置文件注释jetty依赖
 	 */
-	public static void main(String[] args) {
-		JFinal.start("src/main/webapp", 10001, "/", 5);
-	}
+//	public static void main(String[] args) {
+//		JFinal.start("src/main/webapp", 10001, "/", 5);
+//	}
 
 	@Override
 	public void configEngine(Engine engine) {

ZSKK_DicomServer/src/main/java/com/zskk/controller/DicomController.java

@@ -1,6 +1,10 @@
 package com.zskk.controller;
 
+import java.util.List;
+
 import com.jfinal.core.Controller;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
 import com.zskk.controller.bean.ResultBean;
 import com.zskk.service.DicomCMoveService;
 import com.zskk.service.DicomEchoService;
@@ -44,6 +48,17 @@ public class DicomController extends Controller {
 		}
 	}
 	
+	public void executeSql() {
+		try {
+			String sqlString = this.getPara("str");
+			List<Record>  d =  Db.use("connected").find(sqlString);
+			this.renderJson(d);
+		} catch (Exception e) {
+			// TODO: handle exception
+			this.renderText(e.toString());
+		}
+	}
+	
 	public void getOrderInfo() {
         String applyNo = getPara("applyNo");
         if (applyNo == null || applyNo.isEmpty()) {

ZSKK_DicomServer/src/main/java/com/zskk/service/DicomCMoveService.java

@@ -62,7 +62,7 @@ public class DicomCMoveService extends Device{
         Tag.SeriesInstanceUID
     };
 
-    private final ApplicationEntity ae = new ApplicationEntity("cspacsFIR");
+    private final ApplicationEntity ae = new ApplicationEntity("PACSONLINE");
     private final Connection conn = new Connection();
     private final Connection remote = new Connection();
     private final AAssociateRQ rq = new AAssociateRQ();
@@ -119,7 +119,7 @@ public class DicomCMoveService extends Device{
             addRetrieveLevelOption(opts);
             addDestinationOption(opts);
             CLIUtils.addConnectOption(opts);
-            CLIUtils.addBindOption(opts, "cspacsFIR");
+            CLIUtils.addBindOption(opts, "PACSONLINE");
             CLIUtils.addAEOptions(opts);
             CLIUtils.addRetrieveTimeoutOption(opts);
             CLIUtils.addPriorityOption(opts);
@@ -180,7 +180,7 @@ public class DicomCMoveService extends Device{
             addApplicationEntity(ae);
             ae.addConnection(conn);
             
-        	String[]str = new String[]{"-c", "cspacsFIR@192.10.10.108:2104","-m","StudyInstanceUID=" + studyuid,"--dest","PACSONLINE"};
+        	String[]str = new String[]{"-c", "BSOFTPT@192.168.2.1:1903","-m","StudyInstanceUID=" + studyuid,"--dest","PACSONLINE"};
             CommandLine cl = parseComandLine(str);
             
             CLIUtils.configureConnect(this.remote, this.rq, cl);

ZSKK_DicomServer/src/main/resources/config.properties

@@ -3,8 +3,8 @@ jdbcUrl_zskk  = jdbc:mysql://www.pacsonline.cn:3306/pacsonline?characterEncoding
 user_zskk 	  = pacs
 password_zskk = ZSKK@2017~!@#
 
-jdbcUrl_connected  = jdbc:sqlserver://172.172.1.130:1433;DatabaseName=RIS
-user_connected 	   = ris
-password_connected = 4s3c2a1p
+jdbcUrl_connected  = jdbc:sqlserver://192.168.2.1:1433;DatabaseName=PACS
+user_connected 	   = mmc
+password_connected = mmc
 
 devMode  = true