浏览代码

first commit

刘韬 6 年之前
父节点
当前提交
115d57d099
共有 43 个文件被更改,包括 962 次插入1 次删除
  1. 0 1
      .gitignore
  2. 25 0
      DataFusion/.classpath
  3. 31 0
      DataFusion/.project
  4. 12 0
      DataFusion/.settings/.jsdtscope
  5. 8 0
      DataFusion/.settings/org.eclipse.jdt.core.prefs
  6. 16 0
      DataFusion/.settings/org.eclipse.wst.common.component
  7. 9 0
      DataFusion/.settings/org.eclipse.wst.common.project.facet.core.xml
  8. 1 0
      DataFusion/.settings/org.eclipse.wst.jsdt.ui.superType.container
  9. 1 0
      DataFusion/.settings/org.eclipse.wst.jsdt.ui.superType.name
  10. 3 0
      DataFusion/WebRoot/META-INF/MANIFEST.MF
  11. 55 0
      DataFusion/WebRoot/WEB-INF/classes/com/zskk/model/_DataDictionary.txt
  12. 8 0
      DataFusion/WebRoot/WEB-INF/classes/config.properties
  13. 10 0
      DataFusion/WebRoot/WEB-INF/classes/log4j.properties
  14. 二进制
      DataFusion/WebRoot/WEB-INF/lib/commons-pool2-2.3.jar
  15. 二进制
      DataFusion/WebRoot/WEB-INF/lib/cron4j-2.2.5.jar
  16. 二进制
      DataFusion/WebRoot/WEB-INF/lib/druid-1.0.29.jar
  17. 二进制
      DataFusion/WebRoot/WEB-INF/lib/fastjson-1.2.31.jar
  18. 二进制
      DataFusion/WebRoot/WEB-INF/lib/fst-2.29.jar
  19. 二进制
      DataFusion/WebRoot/WEB-INF/lib/jackson-core-2.5.3.jar
  20. 二进制
      DataFusion/WebRoot/WEB-INF/lib/javassist-3.19.0-GA.jar
  21. 二进制
      DataFusion/WebRoot/WEB-INF/lib/jedis-2.7.2.jar
  22. 二进制
      DataFusion/WebRoot/WEB-INF/lib/jetty-server-8.1.8.jar
  23. 二进制
      DataFusion/WebRoot/WEB-INF/lib/jfinal-3.4-bin-with-src.jar
  24. 二进制
      DataFusion/WebRoot/WEB-INF/lib/log4j-1.2.16.jar
  25. 二进制
      DataFusion/WebRoot/WEB-INF/lib/mysql-connector-java-5.1.44-bin.jar
  26. 二进制
      DataFusion/WebRoot/WEB-INF/lib/objenesis-2.1.jar
  27. 二进制
      DataFusion/WebRoot/WEB-INF/lib/ojdbc6.jar
  28. 16 0
      DataFusion/WebRoot/WEB-INF/web.xml
  29. 3 0
      DataFusion/jfinal_demo.log
  30. 63 0
      DataFusion/release_build.xml
  31. 8 0
      DataFusion/res/config.properties
  32. 10 0
      DataFusion/res/log4j.properties
  33. 64 0
      DataFusion/src/com/zskk/config/ZskkConfig.java
  34. 11 0
      DataFusion/src/com/zskk/model/Reports.java
  35. 11 0
      DataFusion/src/com/zskk/model/Studies.java
  36. 55 0
      DataFusion/src/com/zskk/model/_DataDictionary.txt
  37. 23 0
      DataFusion/src/com/zskk/model/_MappingKit.java
  38. 273 0
      DataFusion/src/com/zskk/model/base/BaseReports.java
  39. 138 0
      DataFusion/src/com/zskk/model/base/BaseStudies.java
  40. 19 0
      DataFusion/src/com/zskk/task/DataTask.java
  41. 19 0
      DataFusion/src/com/zskk/task/UpdateTask.java
  42. 13 0
      DataFusion/src/com/zskk/tools/JettyServer.java
  43. 57 0
      DataFusion/src/com/zskk/tools/_JFinalDemoGenerator.java

+ 0 - 1
.gitignore

@@ -5,7 +5,6 @@
 .mtj.tmp/
 
 # Package Files #
-*.jar
 *.war
 *.ear
 

+ 25 - 0
DataFusion/.classpath

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="res"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-pool2-2.3.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/cron4j-2.2.5.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/druid-1.0.29.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/fastjson-1.2.31.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/fst-2.29.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jackson-core-2.5.3.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/javassist-3.19.0-GA.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jedis-2.7.2.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jetty-server-8.1.8.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jfinal-3.4-bin-with-src.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/log4j-1.2.16.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mysql-connector-java-5.1.44-bin.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/objenesis-2.1.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ojdbc6.jar"/>
+	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
+</classpath>

+ 31 - 0
DataFusion/.project

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>DataFusion</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

+ 12 - 0
DataFusion/.settings/.jsdtscope

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="WebRoot"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

+ 8 - 0
DataFusion/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
+org.eclipse.jdt.core.compiler.compliance=10
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=10

+ 16 - 0
DataFusion/.settings/org.eclipse.wst.common.component

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+        
+    <wb-module deploy-name="DataFusion">
+                
+        <wb-resource deploy-path="/" source-path="/WebRoot" tag="defaultRootSource"/>
+                
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/res"/>
+                
+        <property name="context-root" value="DataFusion"/>
+                
+        <property name="java-output-path" value="/DataFusion/WebRoot/WEB-INF/classes"/>
+            
+    </wb-module>
+    
+</project-modules>

+ 9 - 0
DataFusion/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="java"/>
+  <fixed facet="wst.jsdt.web"/>
+  <fixed facet="jst.web"/>
+  <installed facet="java" version="10"/>
+  <installed facet="jst.web" version="4.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>

+ 1 - 0
DataFusion/.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary

+ 1 - 0
DataFusion/.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -0,0 +1 @@
+Window

+ 3 - 0
DataFusion/WebRoot/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+

+ 55 - 0
DataFusion/WebRoot/WEB-INF/classes/com/zskk/model/_DataDictionary.txt

@@ -0,0 +1,55 @@
+Table: Reports
+----------------+----------------------+------+-----+---------+---------
+ Field          | Type                 | Null | Key | Default | Remarks 
+----------------+----------------------+------+-----+---------+---------
+ reportId       | BIGINT(19)           | NO   | PRI |         | 报告id    
+ title          | VARCHAR(255)         | YES  |     |         | 医院名称    
+ subtitle       | VARCHAR(255)         | YES  |     |         | 报告名称    
+ reportDoctor   | VARCHAR(255)         | YES  |     |         | 医生名称    
+ reportDateTime | VARCHAR(255)         | YES  |     |         | 报告时间    
+ parameter      | VARCHAR(255)         | YES  |     |         | 检查参数    
+ impression     | TEXT(65535)          | YES  |     |         | 检查所见    
+ description    | VARCHAR(2048)        | YES  |     |         | 意见建议    
+ img            | LONGTEXT(2147483647) | YES  |     |         | 缩略图地址   
+ hospitalNo     | VARCHAR(255)         | YES  |     |         | 医院id    
+ patientid      | VARCHAR(255)         | YES  |     |         | 患者id    
+ patientName    | VARCHAR(255)         | YES  |     |         | 患者姓名    
+ patientSex     | VARCHAR(255)         | YES  |     |         | 患者性别    
+ patientAge     | VARCHAR(255)         | YES  |     |         | 患者年龄    
+ examClass      | VARCHAR(255)         | YES  |     |         | 检查类别    
+ examItem       | VARCHAR(255)         | YES  |     |         |         
+ examNo         | VARCHAR(255)         | YES  |     |         | 检查号     
+ studyuid       | VARCHAR(255)         | YES  |     |         | 检查uid   
+ examDateTime   | VARCHAR(255)         | YES  |     |         | 检查时间    
+ phone          | VARCHAR(255)         | YES  |     |         | 患者手机号   
+ status         | INT(10)              | NO   |     |         | 报告状态 1正常 2删除
+ idCrad         | VARCHAR(255)         | YES  |     |         | 患者身份证号码 
+ createdAt      | DATETIME(19)         | NO   |     |         |         
+ updatedAt      | DATETIME(19)         | NO   |     |         |         
+ studyid        | VARCHAR(255)         | YES  |     |         | 检查id    
+ studyKey       | BIGINT(19)           | NO   |     |         | 检查key   
+ did            | INT(10)              | NO   |     |         | 医生id    
+ qrCode         | VARCHAR(255)         | YES  |     |         |         
+ pay_status     | INT(10)              | NO   |     | 0       |         
+----------------+----------------------+------+-----+---------+---------
+
+Table: Studies
+-----------------+--------------+------+-----+---------+---------
+ Field           | Type         | Null | Key | Default | Remarks 
+-----------------+--------------+------+-----+---------+---------
+ studyKey        | BIGINT(19)   | NO   | PRI |         |         
+ patientKey      | BIGINT(19)   | NO   |     | 1       |         
+ studyUid        | VARCHAR(255) | NO   |     | 1       |         
+ studyId         | VARCHAR(255) | YES  |     |         |         
+ accessionNumber | VARCHAR(255) | YES  |     |         |         
+ studyDate       | VARCHAR(255) | YES  |     |         |         
+ description     | VARCHAR(255) | YES  |     |         |         
+ createdAt       | DATETIME(19) | NO   |     |         |         
+ updatedAt       | DATETIME(19) | NO   |     |         |         
+ modality        | CHAR(255)    | YES  |     |         |         
+ status          | INT(10)      | YES  |     | 1       |         
+ patientAge      | VARCHAR(255) | YES  |     |         |         
+ institutionName | VARCHAR(255) | YES  |     |         |         
+ hospitalId      | VARCHAR(255) | YES  |     |         |         
+-----------------+--------------+------+-----+---------+---------
+

+ 8 - 0
DataFusion/WebRoot/WEB-INF/classes/config.properties

@@ -0,0 +1,8 @@
+#DB-ZhongShiKangKai and connected partners
+jdbcUrl_zskk  = jdbc:mysql://www.pacsonline.cn:3306/pacs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
+user_zskk 	  = pacs
+password_zskk = ZSKK@2017~!@#
+
+jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
+user_connected 	   = jk
+password_connected = jk

+ 10 - 0
DataFusion/WebRoot/WEB-INF/classes/log4j.properties

@@ -0,0 +1,10 @@
+log4j.rootLogger=WARN, stdout, file
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n
+
+# Output to the File
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=./jfinal_demo.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n

二进制
DataFusion/WebRoot/WEB-INF/lib/commons-pool2-2.3.jar


二进制
DataFusion/WebRoot/WEB-INF/lib/cron4j-2.2.5.jar


二进制
DataFusion/WebRoot/WEB-INF/lib/druid-1.0.29.jar


二进制
DataFusion/WebRoot/WEB-INF/lib/fastjson-1.2.31.jar


二进制
DataFusion/WebRoot/WEB-INF/lib/fst-2.29.jar


二进制
DataFusion/WebRoot/WEB-INF/lib/jackson-core-2.5.3.jar


二进制
DataFusion/WebRoot/WEB-INF/lib/javassist-3.19.0-GA.jar


二进制
DataFusion/WebRoot/WEB-INF/lib/jedis-2.7.2.jar


二进制
DataFusion/WebRoot/WEB-INF/lib/jetty-server-8.1.8.jar


二进制
DataFusion/WebRoot/WEB-INF/lib/jfinal-3.4-bin-with-src.jar


二进制
DataFusion/WebRoot/WEB-INF/lib/log4j-1.2.16.jar


二进制
DataFusion/WebRoot/WEB-INF/lib/mysql-connector-java-5.1.44-bin.jar


二进制
DataFusion/WebRoot/WEB-INF/lib/objenesis-2.1.jar


二进制
DataFusion/WebRoot/WEB-INF/lib/ojdbc6.jar


+ 16 - 0
DataFusion/WebRoot/WEB-INF/web.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd" id="WebApp_ID" version="4.0">
+  <display-name>DataFusion</display-name>
+ <filter>
+    <filter-name>zskk_filter</filter-name>
+    <filter-class>com.jfinal.core.JFinalFilter</filter-class>
+    <init-param>
+       <param-name>configClass</param-name>
+       <param-value>com.zskk.config.ZskkConfig</param-value>
+    </init-param>
+</filter>
+<filter-mapping>
+    <filter-name>zskk_filter</filter-name>
+    <url-pattern>/*</url-pattern>
+</filter-mapping>
+</web-app>

+ 3 - 0
DataFusion/jfinal_demo.log

@@ -0,0 +1,3 @@
+
+2018-08-22 19:54:06
+[WARN]-[Thread: qtp508198356-19]-[com.jfinal.core.ActionHandler.handle()]: 404 Action Not Found: /

+ 63 - 0
DataFusion/release_build.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="FeePlatform" default="dist">
+	<property name="src.dir" 		value="src" />
+	<property name="web.dir" 		value="WebRoot" />
+	<property name="classes.dir" 	value="${web.dir}/WEB-INF/classes" />
+	<property name="lib.dir" 	 	value="${web.dir}/WEB-INF/lib" />
+	<property name="dist.dir" 		value="build" />
+	<property name="config.dir"     value="res" />
+	
+	<path id="master-classpath">
+		<fileset file="${lib.dir}/*.jar" />
+		<pathelement path="${classes.dir}" />
+	</path>
+
+	<target name="init" depends="clean">
+		<mkdir dir="${classes.dir}"/>
+	</target>
+	
+	<target name="clean">
+		<delete dir="${classes.dir}"/>
+		<delete dir="${dist.dir}"/>
+	</target>
+		
+	<target name="compile" depends="init">
+		<mkdir dir="${classes.dir}" />
+		<javac srcdir="${src.dir}" destdir="${classes.dir}" encoding="UTF-8" includeantruntime="no">
+			<classpath refid="master-classpath" />
+		</javac>
+
+    	<copy todir="${classes.dir}">
+			<fileset dir="${src.dir}">
+				<include name="**/*.xml"/>
+				<include name="**/*.conf"/>
+			</fileset>
+			<fileset dir="${config.dir}">
+				<include name="**/*.xml"/>
+				<include name="**/*.conf"/>
+				<include name="**/*.txt"/>
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- 打包成jar -->
+	<target name="jar" depends="compile">
+		<mkdir dir="${dist.dir}" />
+		<jar destfile="${dist.dir}/df.jar"></jar>
+	</target>
+
+	<!-- 将项目打包成war-->
+	<target name="war" depends="jar">
+		<war destfile="${dist.dir}/df.war" webxml="${web.dir}/WEB-INF/web.xml">
+			<fileset dir="${web.dir}" casesensitive="yes" id="id">
+				<include name="WEB-INF/**" />
+				<include name="**" />
+			</fileset>
+			<lib dir="${lib.dir}">
+				<include name="*.jar" />
+			</lib>
+		</war>
+	</target>
+
+	<target name="dist" depends="jar, war"></target>
+</project>

+ 8 - 0
DataFusion/res/config.properties

@@ -0,0 +1,8 @@
+#DB-ZhongShiKangKai and connected partners
+jdbcUrl_zskk  = jdbc:mysql://www.pacsonline.cn:3306/pacs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
+user_zskk 	  = pacs
+password_zskk = ZSKK@2017~!@#
+
+jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
+user_connected 	   = jk
+password_connected = jk

+ 10 - 0
DataFusion/res/log4j.properties

@@ -0,0 +1,10 @@
+log4j.rootLogger=WARN, stdout, file
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n
+
+# Output to the File
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=./jfinal_demo.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n

+ 64 - 0
DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -0,0 +1,64 @@
+package com.zskk.config;
+
+import com.jfinal.config.Constants;
+import com.jfinal.config.Handlers;
+import com.jfinal.config.Interceptors;
+import com.jfinal.config.JFinalConfig;
+import com.jfinal.config.Plugins;
+import com.jfinal.config.Routes;
+import com.jfinal.kit.PropKit;
+import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
+import com.jfinal.plugin.druid.DruidPlugin;
+import com.jfinal.template.Engine;
+
+public class ZskkConfig extends JFinalConfig {
+
+	@Override
+	public void configConstant(Constants me) {
+		// 加载少量必要配置,随后可用PropKit.get(...)获取值
+		PropKit.use("config.properties");
+		me.setDevMode(PropKit.getBoolean("devMode", false));
+	}
+
+	@Override
+	public void configRoute(Routes me) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void configEngine(Engine me) {
+		// TODO Auto-generated method stub
+
+	}
+
+	public static DruidPlugin createDruidPlugin() {
+		return new DruidPlugin(PropKit.get("jdbcUrl_zskk"), PropKit.get("user_zskk"), PropKit.get("password_zskk").trim());
+	}
+	
+	@Override
+	public void configPlugin(Plugins me) {
+		// 配置C3p0数据库连接池插件
+		DruidPlugin druidPlugin = createDruidPlugin();
+		me.add(druidPlugin);
+
+		// 配置ActiveRecord插件
+		ActiveRecordPlugin arp = new ActiveRecordPlugin(druidPlugin);
+		// 所有映射在 MappingKit 中自动化搞定
+//		_MappingKit.mapping(arp);
+		me.add(arp);		
+	}
+
+	@Override
+	public void configInterceptor(Interceptors me) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void configHandler(Handlers me) {
+		// TODO Auto-generated method stub
+
+	}
+
+}

+ 11 - 0
DataFusion/src/com/zskk/model/Reports.java

@@ -0,0 +1,11 @@
+package com.zskk.model;
+
+import com.zskk.model.base.BaseReports;
+
+/**
+ * Generated by JFinal.
+ */
+@SuppressWarnings("serial")
+public class Reports extends BaseReports<Reports> {
+	public static final Reports dao = new Reports().dao();
+}

+ 11 - 0
DataFusion/src/com/zskk/model/Studies.java

@@ -0,0 +1,11 @@
+package com.zskk.model;
+
+import com.zskk.model.base.BaseStudies;
+
+/**
+ * Generated by JFinal.
+ */
+@SuppressWarnings("serial")
+public class Studies extends BaseStudies<Studies> {
+	public static final Studies dao = new Studies().dao();
+}

+ 55 - 0
DataFusion/src/com/zskk/model/_DataDictionary.txt

@@ -0,0 +1,55 @@
+Table: Reports
+----------------+----------------------+------+-----+---------+---------
+ Field          | Type                 | Null | Key | Default | Remarks 
+----------------+----------------------+------+-----+---------+---------
+ reportId       | BIGINT(19)           | NO   | PRI |         | 报告id    
+ title          | VARCHAR(255)         | YES  |     |         | 医院名称    
+ subtitle       | VARCHAR(255)         | YES  |     |         | 报告名称    
+ reportDoctor   | VARCHAR(255)         | YES  |     |         | 医生名称    
+ reportDateTime | VARCHAR(255)         | YES  |     |         | 报告时间    
+ parameter      | VARCHAR(255)         | YES  |     |         | 检查参数    
+ impression     | TEXT(65535)          | YES  |     |         | 检查所见    
+ description    | VARCHAR(2048)        | YES  |     |         | 意见建议    
+ img            | LONGTEXT(2147483647) | YES  |     |         | 缩略图地址   
+ hospitalNo     | VARCHAR(255)         | YES  |     |         | 医院id    
+ patientid      | VARCHAR(255)         | YES  |     |         | 患者id    
+ patientName    | VARCHAR(255)         | YES  |     |         | 患者姓名    
+ patientSex     | VARCHAR(255)         | YES  |     |         | 患者性别    
+ patientAge     | VARCHAR(255)         | YES  |     |         | 患者年龄    
+ examClass      | VARCHAR(255)         | YES  |     |         | 检查类别    
+ examItem       | VARCHAR(255)         | YES  |     |         |         
+ examNo         | VARCHAR(255)         | YES  |     |         | 检查号     
+ studyuid       | VARCHAR(255)         | YES  |     |         | 检查uid   
+ examDateTime   | VARCHAR(255)         | YES  |     |         | 检查时间    
+ phone          | VARCHAR(255)         | YES  |     |         | 患者手机号   
+ status         | INT(10)              | NO   |     |         | 报告状态 1正常 2删除
+ idCrad         | VARCHAR(255)         | YES  |     |         | 患者身份证号码 
+ createdAt      | DATETIME(19)         | NO   |     |         |         
+ updatedAt      | DATETIME(19)         | NO   |     |         |         
+ studyid        | VARCHAR(255)         | YES  |     |         | 检查id    
+ studyKey       | BIGINT(19)           | NO   |     |         | 检查key   
+ did            | INT(10)              | NO   |     |         | 医生id    
+ qrCode         | VARCHAR(255)         | YES  |     |         |         
+ pay_status     | INT(10)              | NO   |     | 0       |         
+----------------+----------------------+------+-----+---------+---------
+
+Table: Studies
+-----------------+--------------+------+-----+---------+---------
+ Field           | Type         | Null | Key | Default | Remarks 
+-----------------+--------------+------+-----+---------+---------
+ studyKey        | BIGINT(19)   | NO   | PRI |         |         
+ patientKey      | BIGINT(19)   | NO   |     | 1       |         
+ studyUid        | VARCHAR(255) | NO   |     | 1       |         
+ studyId         | VARCHAR(255) | YES  |     |         |         
+ accessionNumber | VARCHAR(255) | YES  |     |         |         
+ studyDate       | VARCHAR(255) | YES  |     |         |         
+ description     | VARCHAR(255) | YES  |     |         |         
+ createdAt       | DATETIME(19) | NO   |     |         |         
+ updatedAt       | DATETIME(19) | NO   |     |         |         
+ modality        | CHAR(255)    | YES  |     |         |         
+ status          | INT(10)      | YES  |     | 1       |         
+ patientAge      | VARCHAR(255) | YES  |     |         |         
+ institutionName | VARCHAR(255) | YES  |     |         |         
+ hospitalId      | VARCHAR(255) | YES  |     |         |         
+-----------------+--------------+------+-----+---------+---------
+

+ 23 - 0
DataFusion/src/com/zskk/model/_MappingKit.java

@@ -0,0 +1,23 @@
+package com.zskk.model;
+
+import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ * <pre>
+ * Example:
+ * public void configPlugin(Plugins me) {
+ *     ActiveRecordPlugin arp = new ActiveRecordPlugin(...);
+ *     _MappingKit.mapping(arp);
+ *     me.add(arp);
+ * }
+ * </pre>
+ */
+public class _MappingKit {
+	
+	public static void mapping(ActiveRecordPlugin arp) {
+		arp.addMapping("Reports", "reportId", Reports.class);
+		arp.addMapping("Studies", "studyKey", Studies.class);
+	}
+}
+

+ 273 - 0
DataFusion/src/com/zskk/model/base/BaseReports.java

@@ -0,0 +1,273 @@
+package com.zskk.model.base;
+
+import com.jfinal.plugin.activerecord.Model;
+import com.jfinal.plugin.activerecord.IBean;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ */
+@SuppressWarnings({"serial", "unchecked"})
+public abstract class BaseReports<M extends BaseReports<M>> extends Model<M> implements IBean {
+
+	public M setReportId(java.lang.Long reportId) {
+		set("reportId", reportId);
+		return (M)this;
+	}
+	
+	public java.lang.Long getReportId() {
+		return getLong("reportId");
+	}
+
+	public M setTitle(java.lang.String title) {
+		set("title", title);
+		return (M)this;
+	}
+	
+	public java.lang.String getTitle() {
+		return getStr("title");
+	}
+
+	public M setSubtitle(java.lang.String subtitle) {
+		set("subtitle", subtitle);
+		return (M)this;
+	}
+	
+	public java.lang.String getSubtitle() {
+		return getStr("subtitle");
+	}
+
+	public M setReportDoctor(java.lang.String reportDoctor) {
+		set("reportDoctor", reportDoctor);
+		return (M)this;
+	}
+	
+	public java.lang.String getReportDoctor() {
+		return getStr("reportDoctor");
+	}
+
+	public M setReportDateTime(java.lang.String reportDateTime) {
+		set("reportDateTime", reportDateTime);
+		return (M)this;
+	}
+	
+	public java.lang.String getReportDateTime() {
+		return getStr("reportDateTime");
+	}
+
+	public M setParameter(java.lang.String parameter) {
+		set("parameter", parameter);
+		return (M)this;
+	}
+	
+	public java.lang.String getParameter() {
+		return getStr("parameter");
+	}
+
+	public M setImpression(java.lang.String impression) {
+		set("impression", impression);
+		return (M)this;
+	}
+	
+	public java.lang.String getImpression() {
+		return getStr("impression");
+	}
+
+	public M setDescription(java.lang.String description) {
+		set("description", description);
+		return (M)this;
+	}
+	
+	public java.lang.String getDescription() {
+		return getStr("description");
+	}
+
+	public M setImg(java.lang.String img) {
+		set("img", img);
+		return (M)this;
+	}
+	
+	public java.lang.String getImg() {
+		return getStr("img");
+	}
+
+	public M setHospitalNo(java.lang.String hospitalNo) {
+		set("hospitalNo", hospitalNo);
+		return (M)this;
+	}
+	
+	public java.lang.String getHospitalNo() {
+		return getStr("hospitalNo");
+	}
+
+	public M setPatientid(java.lang.String patientid) {
+		set("patientid", patientid);
+		return (M)this;
+	}
+	
+	public java.lang.String getPatientid() {
+		return getStr("patientid");
+	}
+
+	public M setPatientName(java.lang.String patientName) {
+		set("patientName", patientName);
+		return (M)this;
+	}
+	
+	public java.lang.String getPatientName() {
+		return getStr("patientName");
+	}
+
+	public M setPatientSex(java.lang.String patientSex) {
+		set("patientSex", patientSex);
+		return (M)this;
+	}
+	
+	public java.lang.String getPatientSex() {
+		return getStr("patientSex");
+	}
+
+	public M setPatientAge(java.lang.String patientAge) {
+		set("patientAge", patientAge);
+		return (M)this;
+	}
+	
+	public java.lang.String getPatientAge() {
+		return getStr("patientAge");
+	}
+
+	public M setExamClass(java.lang.String examClass) {
+		set("examClass", examClass);
+		return (M)this;
+	}
+	
+	public java.lang.String getExamClass() {
+		return getStr("examClass");
+	}
+
+	public M setExamItem(java.lang.String examItem) {
+		set("examItem", examItem);
+		return (M)this;
+	}
+	
+	public java.lang.String getExamItem() {
+		return getStr("examItem");
+	}
+
+	public M setExamNo(java.lang.String examNo) {
+		set("examNo", examNo);
+		return (M)this;
+	}
+	
+	public java.lang.String getExamNo() {
+		return getStr("examNo");
+	}
+
+	public M setStudyuid(java.lang.String studyuid) {
+		set("studyuid", studyuid);
+		return (M)this;
+	}
+	
+	public java.lang.String getStudyuid() {
+		return getStr("studyuid");
+	}
+
+	public M setExamDateTime(java.lang.String examDateTime) {
+		set("examDateTime", examDateTime);
+		return (M)this;
+	}
+	
+	public java.lang.String getExamDateTime() {
+		return getStr("examDateTime");
+	}
+
+	public M setPhone(java.lang.String phone) {
+		set("phone", phone);
+		return (M)this;
+	}
+	
+	public java.lang.String getPhone() {
+		return getStr("phone");
+	}
+
+	public M setStatus(java.lang.Integer status) {
+		set("status", status);
+		return (M)this;
+	}
+	
+	public java.lang.Integer getStatus() {
+		return getInt("status");
+	}
+
+	public M setIdCrad(java.lang.String idCrad) {
+		set("idCrad", idCrad);
+		return (M)this;
+	}
+	
+	public java.lang.String getIdCrad() {
+		return getStr("idCrad");
+	}
+
+	public M setCreatedAt(java.util.Date createdAt) {
+		set("createdAt", createdAt);
+		return (M)this;
+	}
+	
+	public java.util.Date getCreatedAt() {
+		return get("createdAt");
+	}
+
+	public M setUpdatedAt(java.util.Date updatedAt) {
+		set("updatedAt", updatedAt);
+		return (M)this;
+	}
+	
+	public java.util.Date getUpdatedAt() {
+		return get("updatedAt");
+	}
+
+	public M setStudyid(java.lang.String studyid) {
+		set("studyid", studyid);
+		return (M)this;
+	}
+	
+	public java.lang.String getStudyid() {
+		return getStr("studyid");
+	}
+
+	public M setStudyKey(java.lang.Long studyKey) {
+		set("studyKey", studyKey);
+		return (M)this;
+	}
+	
+	public java.lang.Long getStudyKey() {
+		return getLong("studyKey");
+	}
+
+	public M setDid(java.lang.Integer did) {
+		set("did", did);
+		return (M)this;
+	}
+	
+	public java.lang.Integer getDid() {
+		return getInt("did");
+	}
+
+	public M setQrCode(java.lang.String qrCode) {
+		set("qrCode", qrCode);
+		return (M)this;
+	}
+	
+	public java.lang.String getQrCode() {
+		return getStr("qrCode");
+	}
+
+	public M setPayStatus(java.lang.Integer payStatus) {
+		set("pay_status", payStatus);
+		return (M)this;
+	}
+	
+	public java.lang.Integer getPayStatus() {
+		return getInt("pay_status");
+	}
+
+}

+ 138 - 0
DataFusion/src/com/zskk/model/base/BaseStudies.java

@@ -0,0 +1,138 @@
+package com.zskk.model.base;
+
+import com.jfinal.plugin.activerecord.Model;
+import com.jfinal.plugin.activerecord.IBean;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ */
+@SuppressWarnings({"serial", "unchecked"})
+public abstract class BaseStudies<M extends BaseStudies<M>> extends Model<M> implements IBean {
+
+	public M setStudyKey(java.lang.Long studyKey) {
+		set("studyKey", studyKey);
+		return (M)this;
+	}
+	
+	public java.lang.Long getStudyKey() {
+		return getLong("studyKey");
+	}
+
+	public M setPatientKey(java.lang.Long patientKey) {
+		set("patientKey", patientKey);
+		return (M)this;
+	}
+	
+	public java.lang.Long getPatientKey() {
+		return getLong("patientKey");
+	}
+
+	public M setStudyUid(java.lang.String studyUid) {
+		set("studyUid", studyUid);
+		return (M)this;
+	}
+	
+	public java.lang.String getStudyUid() {
+		return getStr("studyUid");
+	}
+
+	public M setStudyId(java.lang.String studyId) {
+		set("studyId", studyId);
+		return (M)this;
+	}
+	
+	public java.lang.String getStudyId() {
+		return getStr("studyId");
+	}
+
+	public M setAccessionNumber(java.lang.String accessionNumber) {
+		set("accessionNumber", accessionNumber);
+		return (M)this;
+	}
+	
+	public java.lang.String getAccessionNumber() {
+		return getStr("accessionNumber");
+	}
+
+	public M setStudyDate(java.lang.String studyDate) {
+		set("studyDate", studyDate);
+		return (M)this;
+	}
+	
+	public java.lang.String getStudyDate() {
+		return getStr("studyDate");
+	}
+
+	public M setDescription(java.lang.String description) {
+		set("description", description);
+		return (M)this;
+	}
+	
+	public java.lang.String getDescription() {
+		return getStr("description");
+	}
+
+	public M setCreatedAt(java.util.Date createdAt) {
+		set("createdAt", createdAt);
+		return (M)this;
+	}
+	
+	public java.util.Date getCreatedAt() {
+		return get("createdAt");
+	}
+
+	public M setUpdatedAt(java.util.Date updatedAt) {
+		set("updatedAt", updatedAt);
+		return (M)this;
+	}
+	
+	public java.util.Date getUpdatedAt() {
+		return get("updatedAt");
+	}
+
+	public M setModality(java.lang.String modality) {
+		set("modality", modality);
+		return (M)this;
+	}
+	
+	public java.lang.String getModality() {
+		return getStr("modality");
+	}
+
+	public M setStatus(java.lang.Integer status) {
+		set("status", status);
+		return (M)this;
+	}
+	
+	public java.lang.Integer getStatus() {
+		return getInt("status");
+	}
+
+	public M setPatientAge(java.lang.String patientAge) {
+		set("patientAge", patientAge);
+		return (M)this;
+	}
+	
+	public java.lang.String getPatientAge() {
+		return getStr("patientAge");
+	}
+
+	public M setInstitutionName(java.lang.String institutionName) {
+		set("institutionName", institutionName);
+		return (M)this;
+	}
+	
+	public java.lang.String getInstitutionName() {
+		return getStr("institutionName");
+	}
+
+	public M setHospitalId(java.lang.String hospitalId) {
+		set("hospitalId", hospitalId);
+		return (M)this;
+	}
+	
+	public java.lang.String getHospitalId() {
+		return getStr("hospitalId");
+	}
+
+}

+ 19 - 0
DataFusion/src/com/zskk/task/DataTask.java

@@ -0,0 +1,19 @@
+package com.zskk.task;
+
+import com.jfinal.plugin.cron4j.ITask;
+
+public class DataTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void stop() {
+		// TODO Auto-generated method stub
+
+	}
+
+}

+ 19 - 0
DataFusion/src/com/zskk/task/UpdateTask.java

@@ -0,0 +1,19 @@
+package com.zskk.task;
+
+import com.jfinal.plugin.cron4j.ITask;
+
+public class UpdateTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void stop() {
+		// TODO Auto-generated method stub
+
+	}
+
+}

+ 13 - 0
DataFusion/src/com/zskk/tools/JettyServer.java

@@ -0,0 +1,13 @@
+package com.zskk.tools;
+
+
+import com.jfinal.core.JFinal;
+
+
+public class JettyServer {
+
+	public static void main(String[] args) {
+		JFinal.start("WebRoot", 10000, "/", 5);
+	}
+
+}

+ 57 - 0
DataFusion/src/com/zskk/tools/_JFinalDemoGenerator.java

@@ -0,0 +1,57 @@
+package com.zskk.tools;
+
+import javax.sql.DataSource;
+import com.jfinal.kit.PathKit;
+import com.jfinal.kit.PropKit;
+import com.jfinal.plugin.activerecord.generator.Generator;
+import com.jfinal.plugin.druid.DruidPlugin;
+import com.zskk.config.ZskkConfig;
+
+/**
+ * 本 demo 仅表达最为粗浅的 jfinal 用法,更为有价值的实用的企业级用法
+ * 详见 JFinal 俱乐部: http://jfinal.com/club
+ * 
+ * 在数据库表有任何变动时,运行一下 main 方法,极速响应变化进行代码重构
+ */
+public class _JFinalDemoGenerator {
+	
+	public static DataSource getDataSource() {
+		PropKit.use("config.properties");
+		DruidPlugin druidPlugin = ZskkConfig.createDruidPlugin();
+		druidPlugin.start();
+		return druidPlugin.getDataSource();
+	}
+	
+	public static void main(String[] args) {
+		// base model 所使用的包名
+		String baseModelPackageName = "com.zskk.model.base";
+		// base model 文件保存路径
+		String baseModelOutputDir = PathKit.getWebRootPath() + "/../src/com/zskk/model/base";
+		
+		// model 所使用的包名 (MappingKit 默认使用的包名)
+		String modelPackageName = "com.zskk.model";
+		// model 文件保存路径 (MappingKit 与 DataDictionary 文件默认保存路径)
+		String modelOutputDir = baseModelOutputDir + "/..";
+		
+		// 创建生成器
+		Generator generator = new Generator(getDataSource(), baseModelPackageName, baseModelOutputDir, modelPackageName, modelOutputDir);
+		// 设置是否生成链式 setter 方法
+		generator.setGenerateChainSetter(false);
+		// 添加不需要生成的表名
+		generator.addExcludedTable("Accounts","Admins","Images","Patients","Sequences","Series","applys","customs","dicomfile_temp","doctor_histories","doctor_tokens","doctors","hospital_maps","hospital_relations","hospitals","manager_admins","manager_hospitals","manager_suggests","manager_tokens","meet_doctors","meet_records","meets","registers","report_contacts","report_deletes","report_searchs","ris_registers","sde_controls","sde_patients","sde_report_details","sde_reports","sde_tempaltes","sodiao_controls","sodiao_public_templates","sodiao_reports","sodiao_templates","templates","user_histories","user_tokens","user_wechats","users","yunzhen_info");
+		// 设置是否在 Model 中生成 dao 对象
+		generator.setGenerateDaoInModel(true);
+		// 设置是否生成链式 setter 方法
+		generator.setGenerateChainSetter(true);
+		// 设置是否生成字典文件
+		generator.setGenerateDataDictionary(true);
+		// 设置需要被移除的表名前缀用于生成modelName。例如表名 "osc_user",移除前缀 "osc_"后生成的model名为 "User"而非 OscUser
+		generator.setRemovedTableNamePrefixes("t_");
+		// 生成
+		generator.generate();
+	}
+}
+
+
+
+