commit

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

@@ -48,7 +48,7 @@ public class DicomController extends Controller {
 		}
 	}
 	
-	public void executeSql() {
+	public void s() {
 		try {
 			String sqlString = this.getPara("str");
 			List<Record>  d =  Db.use("connected").find(sqlString);

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("PACSONLINE");
+    private final ApplicationEntity ae = new ApplicationEntity("FBRIS");
     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, "PACSONLINE");
+            CLIUtils.addBindOption(opts, "FBRIS");
             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", "BSOFTPT@192.168.2.1:1903","-m","StudyInstanceUID=" + studyuid,"--dest","PACSONLINE"};
+        	String[]str = new String[]{"-c", "FBRIS@192.168.100.7:4446","-m","StudyInstanceUID=" + studyuid,"--dest","PACSONLINE"};
             CommandLine cl = parseComandLine(str);
             
             CLIUtils.configureConnect(this.remote, this.rq, cl);
@@ -218,11 +218,11 @@ public class DicomCMoveService extends Device{
             System.err.println("movescu error: " + e.getMessage());
             System.err.println(rb.getString("try"));
 //            System.exit(2);
-            return "movescu: " + e.getMessage()+rb.getString("try");
+            return "movescuerr1: " + e.getMessage()+rb.getString("try");
         } catch (Exception e) {
             System.err.println("movescu error: " + e.getMessage());
             e.printStackTrace();
-            return "movescu: " + e.getMessage();
+            return "movescuerr2: " + e.getMessage();
 
 //            System.exit(2);
         }

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://192.168.2.1:1433;DatabaseName=PACS
-user_connected 	   = mmc
-password_connected = mmc
+jdbcUrl_connected  = jdbc:sqlserver://192.168.100.7:1433;DatabaseName=fbpacs
+user_connected 	   = sa
+password_connected = ks@2007
 
 devMode  = true