ladventure
/
data_aggregation_backend
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
389 Commits 2 Branches 0 Tags 64 MiB
Commit Graph

44 Commits

Author SHA1 Message Date
ladventure c0c96f2c94 修复数据迁移bug 2018-05-13 21:59:01 +08:00
ladventure 36937b8056 修复excel导入导出bug 
修复文件包下载bug
    修复数据导出bug
 2018-05-13 21:59:01 +08:00
ladventure 2d4cc61dd0 修改命名不规范 
增加新增汇总库功能
 2018-05-13 21:59:00 +08:00
ladventure 8e822e876c 整理代码到新项目 2018-01-11 09:47:52 +08:00
ladventure 78b82266e3 修复信息系统打包下载bug，以及配置错误。 
格式化代码。
将controller改成@RestController修复启动错误
Signed-off-by: ladventure <dylan-lili@foxmail.com>
 2018-01-10 23:06:46 +08:00
ladventure f6ec25e494 1.修复汇总bug 
2.添加@RestController
 2017-12-18 16:50:44 +08:00
chenlw 582f55a619 关闭游标数，，finally里关闭 2017-02-20 16:47:30 +08:00
chenlw 95c439a114 测试 2016-12-28 11:20:28 +08:00
chenlw 9bfc4a8862 .. 2016-12-21 09:58:41 +08:00
chenlw 6a5f085793 测试 2016-12-19 16:33:32 +08:00
chenlw 6454a33f0e 测试 2016-12-19 16:33:25 +08:00
chenlw aab9175af0 测试 2016-12-19 10:20:27 +08:00
chenlw 935bb23809 测试 2016-12-15 10:09:58 +08:00
chenlw 08dd21dc36 测试文件 2016-12-13 09:49:16 +08:00
chenlw ad628fdc2a 测试 2016-12-07 09:28:47 +08:00
chenlw d6a63b0fdf 测试 2016-12-02 10:14:19 +08:00
chenlw d07a4457bb 修改~~~ 2016-11-24 17:48:24 +08:00
chenlw e0d09a7374 测试 2016-11-18 09:31:28 +08:00
chenlw a61bc3481d 单元测试测试， 2016-11-10 16:19:23 +08:00
chenlw e7dc85ad99 测试 2016-11-07 14:37:59 +08:00
chenlw 6a92ee0f2c 新功能开发结束 2016-11-03 14:24:30 +08:00
chenlw bc310b9432 测试 2016-10-31 18:56:57 +08:00
chenlw 3ea2239feb 单元测试类 2016-10-30 12:32:40 +08:00
chenlw 8616a39ff8 测试 2016-10-27 14:33:32 +08:00
chenlw 385ad58fb5 单元测试 2016-10-25 18:41:38 +08:00
chenlw 8a8e52357d 修改表 2016-10-25 10:31:01 +08:00
chenlw c0239a9c6b 测试 2016-10-21 09:03:26 +08:00
chenlw 49ca89da79 excel写入 2016-10-19 08:46:26 +08:00
chenlw 97fe299236 测试类 2016-10-18 15:35:43 +08:00
chenlw 191aecd828 Merge branch 'web_backend_develope' of 
https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope

Conflicts:
	src/com/platform/controller/DataModelController.java
	src/com/platform/oracle/OracleConnector.java
	src/com/platform/service/OracleExtractHelper.java
	src/com/platform/service/impl/OracleExtractServiceImpl.java
 2016-09-22 14:51:41 +08:00
chenlw 058a232cbb 抽取修改 2016-09-22 10:40:28 +08:00
chenlw fead9d9371 Merge branch 'web_backend_develope' of 
https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope

Conflicts:
	src/com/base/BaseController.java
	src/com/platform/controller/DataModelController.java
	src/com/platform/service/impl/MoveDataServiceImpl.java
	src/com/platform/service/impl/OracleExtractServiceImpl.java
	src/com/platform/utils/Constant.java
 2016-09-20 20:45:20 +08:00
chenlw b56e1a8deb 恢复test 2016-09-20 14:46:38 +08:00
chenlw a1310b127d 会略 2016-09-20 14:19:04 +08:00
chenlw 172b1b512b Merge branch 'web_backend_develope' of 
https://git.trustie.net/fhx569287825/aggregation-platform

Conflicts:
	src/com/platform/controller/DataModelController.java
 2016-09-20 14:14:11 +08:00
wu ming d2f5305d2b 合并-9.14 2016-09-14 14:11:16 +08:00
wu ming 608e658d3a 修复启动oracle服务，测试连接oracle的Bub 2016-09-14 13:56:16 +08:00
lily 48ae986d5c reset add md5checkout 2016-09-13 10:38:09 +08:00
wu ming ceaef2d1b0 合并 2016-09-12 19:22:35 +08:00
chenlw 9aa8e675ae Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform 
Conflicts:
	build/classes/com/platform/controller/DataModelController.class
	build/classes/com/platform/controller/DefaultController.class
	build/classes/com/platform/entities/FolderNode.class
	build/classes/com/platform/service/OracleExtractService.class
	build/classes/com/platform/test/TestController.class
	build/classes/com/platform/test/TestEncodeInfoDao.class
	build/classes/com/platform/test/TestEncodeService.class
	build/classes/com/platform/utils/Configs.class
	build/classes/com/platform/utils/ConfigsLoader.class
	src/com/platform/controller/DataModelController.java
 2016-09-11 17:46:20 +08:00
wu ming 939f2a0de3 基础版 2016-09-09 16:45:40 +08:00
chenlw d7da61c394 改编码方式utf8 2016-09-08 11:26:14 +08:00
Chariesliven 8b64314d95 增加BaseController全局异常捕获 2016-09-07 23:59:30 +08:00
wu ming c66ba751a7 汇总平台java后台V1版 2016-09-07 17:13:59 +08:00