innov
/
aggregation-platform
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

----合并

Browse Source
web_backend_develope
wu ming 9 years ago
parent 83b3c8975a 1fd5b15305
commit 7bcc95e0d4
16 changed files with 1811 additions and 1695 deletions
Show Stats Download Patch File Download Diff File

239
WebContent/WEB-INF/config/config.properties
Unescape View File

@ -1,119 +1,120 @@
#=============================================================================================================
# MySQL
#=============================================================================================================
# 驱动程序
jdbc.mysql.driver=com.mysql.jdbc.Driver
# 连接url
jdbc.mysql.url=jdbc:mysql://192.168.0.110:3306/ftpdata?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false
# 用户名
jdbc.mysql.username=root
# 密码
jdbc.mysql.password=root
#=============================================================================================================
# Oracle 连接配置
#=============================================================================================================
# hui用户名
gather-user-name=system
gather-standard-user-name=u_bzbjy
gather-standard-exec-table-name=kzxzb
gather-standard-pay-table-name=zfxxb
# 密码
gather-user-password=oracle
#
gather-port=1521
#
gather-service-name=orcl
#=============================================================================================================
# 数据库公共配置
#=============================================================================================================
jdbc.initialSize=5
jdbc.minIdle=5
jdbc.maxIdle=20
jdbc.maxActive=100
jdbc.maxWait=100000
jdbc.defaultAutoCommit=false
jdbc.removeAbandoned=true
jdbc.removeAbandonedTimeout=600
jdbc.testWhileIdle=true
jdbc.timeBetweenEvictionRunsMillis=60000
jdbc.numTestsPerEvictionRun=20
jdbc.minEvictableIdleTimeMillis=300000
#==============================================================================================================
#
#==============================================================================================================
table-suffix=_20152016
gather-tablespace-name=TS_TTSSS
#dbf file's path must exist
gather-tablespace-path=/opt/oracle/app/oradata/orcl/
# user's password must exist
gather-table-user-password=user
#kuber's url must exist
kubeMasterUrl=http://192.168.0.110:8080/
kubeMasterAddress=192.168.0.110:8080
collect-user-name=system
collect-password=oracle
collect-service-name=orcl
# standard table :
# eg:sql -> select count(*) from u_bzbjy.kzxzb; select count(*) from u_bzbjy.zfxxb;
collect-user-table=U_BZBJY
collect-exec-table=KZXZB
collect-pay-table=ZFXXB
#gfs web's IP
gfs_control_ip=192.168.0.110
#gfs web password of root
gfs_control_rootPassWd=root
#url of gfs web
HttpClientConstant_URL_IP_PORT=http://192.168.0.110:9001/
#data between 6 month ago and now
dataBefore=6
#move a data once
moveFileMaxNum=1
#import 5 rows of Excel once
numOneImportExcel=5
oracle-orcl=orcl
oracle-user=system
oracle-psw=oracle
#=============================================================================================================
# windows path
#=============================================================================================================
extract-log-localtion=D:\\test\\log\\
extract-standard-log-localtion=D:\\test\\log2\\
file_upload_path=D:\\test\\
file_download_path=D:\\test\\export.xlsx
package_download_path=D:\\test\\
package_name=sql_script_standard
sql_script_path_last=D:\\test\\sql_script_last\\
sql_script_path_standard=D:\\test\\sql_script_standard\\
#=============================================================================================================
# linux path
#=============================================================================================================
## extract's log file location
#extract-log-localtion=/home/web_manage/log/
## standard extract's log file location
#extract-standard-log-localtion=/home/web_manage/log2/
##import excel file's location
#file_upload_path=/excel_import_dir/
##export excel file's location
#file_download_path=/excel_export_dir/export.xlsx
##file package download's location
#package_download_path=/
##file package's name
#package_name=DefaultDescription
##location of sql script lastest
#sql_script_path_last=/DefaultDescription_last/
##location of sql script standard
#sql_script_path_standard=/DefaultDescription/
#=============================================================================================================
# MySQL
#=============================================================================================================
# 驱动程序
jdbc.mysql.driver=com.mysql.jdbc.Driver
# 连接url
jdbc.mysql.url=jdbc:mysql://192.168.0.110:3306/ftpdata?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false
# 用户名
jdbc.mysql.username=root
# 密码
jdbc.mysql.password=root
#=============================================================================================================
# Oracle 连接配置
#=============================================================================================================
# hui用户名
gather-user-name=system
gather-standard-user-name=u_bzbjy
gather-standard-exec-table-name=kzxzb
gather-standard-pay-table-name=zfxxb
# 密码
gather-user-password=oracle
#
gather-port=1521
#
gather-service-name=orcl
#=============================================================================================================
# 数据库公共配置
#=============================================================================================================
jdbc.initialSize=5
jdbc.minIdle=5
jdbc.maxIdle=20
jdbc.maxActive=100
jdbc.maxWait=100000
jdbc.defaultAutoCommit=false
jdbc.removeAbandoned=true
jdbc.removeAbandonedTimeout=600
jdbc.testWhileIdle=true
jdbc.timeBetweenEvictionRunsMillis=60000
jdbc.numTestsPerEvictionRun=20
jdbc.minEvictableIdleTimeMillis=300000
#==============================================================================================================
#
#==============================================================================================================
table-suffix=_20152016
gather-tablespace-name=TS_TTSSS
#dbf file's path must exist
gather-tablespace-path=/opt/oracle/app/oradata/orcl/
# user's password must exist
gather-table-user-password=user
#kuber's url must exist
kubeMasterUrl=http://192.168.0.110:8080/
kubeMasterAddress=192.168.0.110:8080
collect-user-name=system
collect-password=oracle
collect-service-name=orcl
# standard table :
# eg:sql -> select count(*) from u_bzbjy.kzxzb; select count(*) from u_bzbjy.zfxxb;
collect-user-table=U_BZBJY
collect-exec-table=KZXZB
collect-pay-table=ZFXXB
#gfs web's IP
gfs_control_ip=192.168.0.110
#gfs web password of root
gfs_control_rootPassWd=root
#url of gfs web
HttpClientConstant_URL_IP_PORT=http://192.168.0.110:9001/
#data between 6 month ago and now
dataBefore=6
#move a data once
moveFileMaxNum=1
#import 5 rows of Excel once
numOneImportExcel=5
oracle-orcl=orcl
oracle-user=system
oracle-psw=oracle
#=============================================================================================================
# windows path
#=============================================================================================================
extract-log-localtion=D:\\test\\log\\
extract-standard-log-localtion=D:\\test\\log2\\
file_upload_path=D:\\test\\
file_download_path=D:\\test\\export.xlsx
package_download_path=D:\\test\\
package_name=sql_script_standard
sql_script_path_last=D:\\test\\sql_script_last\\
sql_script_path_standard=D:\\test\\sql_script_standard\\
#=============================================================================================================
# linux path
#=============================================================================================================
## extract's log file location
#extract-log-localtion=/home/web_manage/log/
## standard extract's log file location
#extract-standard-log-localtion=/home/web_manage/log2/
##import excel file's location
#file_upload_path=/excel_import_dir/
##export excel file's location
#file_download_path=/excel_export_dir/export.xlsx
##file package download's location
#package_download_path=/
##file package's name
#package_name=DefaultDescription
##location of sql script lastest
#sql_script_path_last=/DefaultDescription_last/
##location of sql script standard
#sql_script_path_standard=/DefaultDescription/

6
src/com/platform/controller/CheckoutController.java
Unescape View File

@ -58,7 +58,7 @@ public class CheckoutController extends BaseController {
}
/**
* 信息系统--校验--查看所有系统的 标准表情况
* 信息系统--校验--查看系统的 标准表情况
* @return
* @throws Exception
*/
@ -95,7 +95,7 @@ public class CheckoutController extends BaseController {
}
/**
* 信息系统--校验--查看单条数据的修改详情
* 信息系统--校验--查看单条数据的详情
* @return
* @throws Exception
*/
@ -116,7 +116,7 @@ public class CheckoutController extends BaseController {
}
/**
* 信息系统--校验--查看后 -> 单条数据的修改详情
* 信息系统--校验--(查看后 )单条数据的修改详情
* @return
* @throws Exception
*/

974
src/com/platform/controller/DataModelController.java
View File

File diff suppressed because it is too large Load Diff

12
src/com/platform/form/PagerOptions.java
Unescape View File

@ -39,13 +39,13 @@ public class PagerOptions extends Page{
private Integer offset; // 查询偏移量：起始id
private String keyQuery;
//模糊查询字段
private List<String> array;
private String keyQuery;//模糊查询字段
private String volumeType;
//冷热区字段
private String mark;
private List<String> array;//模糊查询字段数组
private String volumeType;//冷热区字段
private String mark;//冷热区字段
public String getDataType() {
return dataType;

10
src/com/platform/form/ScriptForm.java
Unescape View File

@ -5,10 +5,20 @@ import java.util.Properties;
import com.platform.entities.SqlFileInfoEntity;
/**
* @author chen
* 脚本 表单接收
*/
public class ScriptForm {
/**
* 脚本内容
*/
private String content;
/**
* 脚本实体内容
*/
private SqlFileInfoEntity item;
/**

2
src/com/platform/form/VolumeForm.java
Unescape View File

@ -29,9 +29,9 @@ public class VolumeForm {
/** 挂载点 */
private String path;
/** * exist，正常返回状态Started,Stopped,Created */
private boolean status;
/** * exist，正常返回状态Started,Stopped,Created */
private String type;
/** volume树形目录 */

11
src/com/platform/form/volumeMoveForm.java
Unescape View File

@ -5,16 +5,25 @@ import java.util.List;
import com.platform.entities.DataInfoEntity;
import com.platform.entities.FolderNode;
/**迁移数据--接收前端传值：volume名，目录，数据对象
/**迁移数据--接收前端传值
* @author chen
*
*/
public class volumeMoveForm {
/**
* volume名
*/
private String name;
/**
* 目录
*/
private FolderNode selectNode;
/**
* 数据对象
*/
private List<DataInfoEntity> selectItems;
/**

6
src/com/platform/service/IMoveDataService.java
Unescape View File

@ -32,6 +32,12 @@ public interface IMoveDataService {
*/
public int delete(DataInfoEntityMoveTmp dataMove) throws Exception;
/** 删除多个
* @return
* @throws Exception
*/
public int delete(String... ids) throws Exception;
/** 迁移数据--更新
* @param data
* @return

410
src/com/platform/service/OracleStatusService.java
View File

File diff suppressed because it is too large Load Diff

15
src/com/platform/service/impl/CheckoutServiceImpl.java
Unescape View File

@ -76,9 +76,9 @@ public class CheckoutServiceImpl implements ICheckoutService {
List<CheckoutEntity> checks = new ArrayList<CheckoutEntity>();
List<PreDataInfo> result = preDataInfoDao.findAllCollect();
DataInfoEntity data = new DataInfoEntity();
Calendar c2 = Calendar.getInstance();
Calendar c2 = Calendar.getInstance();
// 时间设置为 半年前的时间
c2.set(Calendar.MONTH, getMonBeforeHalfYear(c2.get(Calendar.MONTH)));
this.getMonBeforeHalfYear(c2);
String time = DateForm.date2StringByDay(c2.getTime());
data.setCollectingTime(time);
// data.setCollectingTime(collectingTime);
@ -124,7 +124,7 @@ public class CheckoutServiceImpl implements ICheckoutService {
CheckoutEntity cksql = new CheckoutEntity();
Calendar c2 = Calendar.getInstance();
// 时间设置为 半年前的时间
c2.set(Calendar.MONTH, getMonBeforeHalfYear(c2.get(Calendar.MONTH)));
this.getMonBeforeHalfYear(c2);
String time = DateForm.date2StringByDay(c2.getTime());
cksql.setCollectingTime(time);
cksql.setCityName(city);
@ -451,12 +451,9 @@ public class CheckoutServiceImpl implements ICheckoutService {
* @param num
* @return
*/
private int getMonBeforeHalfYear(int num){
num -= Configs.dataBefore;
if (num <= 0) {
num = num + 12;
}
return num;
private int getMonBeforeHalfYear(Calendar c2){
c2.set(Calendar.DAY_OF_YEAR, c2.get(Calendar.DAY_OF_YEAR) -(Configs.dataBefore*30));
return 1;
}
private String isY(String str1, String str2) {

45
src/com/platform/service/impl/MoveDataServiceImpl.java
Unescape View File

@ -210,11 +210,14 @@ public class MoveDataServiceImpl implements IMoveDataService {
}
}
int result = 0;
//迁移失败
if ("3".equals(dataMove.getCompleteStatus())) {
removeservice.deleteFolder(dataMove.getDstPath());
int code = removeservice.deleteFolder(dataMove.getDstPath());
if (code == -100) {
return result;
}
}
int result = 0;
//是正则迁移时：
if ("1".equals(dataMove.getCompleteStatus())) {
if(1 != removeservice.abortcopyFolder(dataMove.getDataPath(), makeDstPath(dataMove.getDstPath()))){
@ -263,4 +266,42 @@ public class MoveDataServiceImpl implements IMoveDataService {
}
return dstPath;
}
@Override
public int delete(String... ids) throws Exception {
List<DataInfoEntityMoveTmp> list = dataInfoMoveTmpDao.findAll();
List<DataInfoEntityMoveTmp> dellist = new ArrayList<DataInfoEntityMoveTmp>();
if (null != list) {
for (DataInfoEntityMoveTmp dataInfoEntityMoveTmp : list) {
for (String id : ids) {
if (Integer.valueOf(id) == dataInfoEntityMoveTmp.getId()) {
dellist.add(dataInfoEntityMoveTmp);
}
}
}
}
int result = 0;
for (DataInfoEntityMoveTmp dataMove : dellist) {
//迁移失败
if ("3".equals(dataMove.getCompleteStatus())) {
int code = removeservice.deleteFolder(dataMove.getDstPath());
if (code == -100) {
continue;
}
}
//是正则迁移时：
if ("1".equals(dataMove.getCompleteStatus())) {
if(1 != removeservice.abortcopyFolder(dataMove.getDataPath(), makeDstPath(dataMove.getDstPath()))){
try{
removeservice.deleteFolder(dataMove.getDstPath());
}catch(Exception e){
log.error(e);
}
}
}
result = dataInfoMoveTmpDao.remove(dataMove.getId());
}
return result;
}
}

838
src/com/platform/service/impl/OracleExtractServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

661
src/com/platform/service/thread/ThreadCheckoutStandardOracle.java
View File

File diff suppressed because it is too large Load Diff

15
src/com/platform/service/thread/ThreadExtractStandardSqlServer.java
Unescape View File

@ -8,6 +8,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Date;
import java.util.List;
@ -154,10 +155,11 @@ public class ThreadExtractStandardSqlServer extends Thread{
// TODO Auto-generated catch block
e.printStackTrace();
}
Connection conn = null;
try {
File execSql = new File(execFilePath);
Connection conn = OracleConnector.connectionBuilder("jdbc:oracle:thin:@" + oracleConnect.getIp() + ":" + oracleConnect.getPort() + ":"
conn = OracleConnector.connectionBuilder("jdbc:oracle:thin:@" + oracleConnect.getIp() + ":" + oracleConnect.getPort() + ":"
+ oracleConnect.getDatabaseName(), oracleConnect.getUser(), oracleConnect.getPassword(), null);
File execSql = new File(execFilePath);
// 创建表空间 创建 抽取标准表的 用户并授权
oracleExtract.createTableSpace(conn, collectOracle , oracleConnect); //
oracleExtract.createOnlyUser(conn, collectOracle, oracleConnect);//
@ -199,8 +201,17 @@ public class ThreadExtractStandardSqlServer extends Thread{
// TODO Auto-generated catch block
e.printStackTrace();
}
finally{
try {
conn.close();
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}
//删除保存过的id
CacheSetCantDelete.removeStandardId(String.valueOf(element.getDataId()));
// sql日志记录时间：

259
src/com/platform/utils/Configs.java
View File

File diff suppressed because it is too large Load Diff

3
src/com/platform/utils/GanymedSSH.java
Unescape View File

@ -114,6 +114,9 @@ public class GanymedSSH {
Session sess = null;
try {
// conn = getOpenedConnection(host, username, password, port);
if (null != conn) {
// conn=getOpenedConnection(Configs., username, password, port)
}
sess = conn.openSession();
// 执锟斤拷cmd
sess.execCommand(cmd);

Write Preview
Loading…
Cancel
Save