调整

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

@@ -1,55 +0,0 @@
-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  |     |         |         
------------------+--------------+------+-----+---------+---------
-

DataFusion/res/log4j.properties

@@ -5,6 +5,6 @@ log4j.appender.stdout.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-
 
 # Output to the File
 log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=./jfinal_demo.log
+log4j.appender.file.File=./zskk_df.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/src/com/zskk/config/ZskkConfig.java

@@ -10,7 +10,6 @@ import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.template.Engine;
-import com.zskk.model._MappingKit;
 
 public class ZskkConfig extends JFinalConfig {
 
@@ -40,16 +39,7 @@ public class ZskkConfig extends JFinalConfig {
 	
 	@Override
 	public void configPlugin(Plugins me) {
-		// 配置C3p0数据库连接池插件
-		DruidPlugin druidPlugin = createDruidPlugin();
-		druidPlugin.start();
-		me.add(druidPlugin);
-
-		// 配置ActiveRecord插件
-		ActiveRecordPlugin arp = new ActiveRecordPlugin(druidPlugin);
-		 //所有映射在 MappingKit 中自动化搞定
-		_MappingKit.mapping(arp);
-		me.add(arp);		
+	
 	}
 
 	@Override

DataFusion/src/com/zskk/model/Reports.java

@@ -1,11 +0,0 @@
-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();
-}

DataFusion/src/com/zskk/model/Studies.java

@@ -1,11 +0,0 @@
-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();
-}

DataFusion/src/com/zskk/model/_DataDictionary.txt

@@ -1,55 +0,0 @@
-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  |     |         |         
------------------+--------------+------+-----+---------+---------
-

DataFusion/src/com/zskk/model/_MappingKit.java

@@ -1,23 +0,0 @@
-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);
-	}
-}
-

DataFusion/src/com/zskk/model/base/BaseReports.java

@@ -1,273 +0,0 @@
-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");
-	}
-
-}

DataFusion/src/com/zskk/model/base/BaseStudies.java

@@ -1,138 +0,0 @@
-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");
-	}
-
-}

DataFusion/src/com/zskk/tools/JettyServer.java

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

DataFusion/src/com/zskk/tools/_JFinalDemoGenerator.java

@@ -1,57 +0,0 @@
-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();
-	}
-}
-
-
-
-