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

修改了查询数据库迁移记录的外键字段，volume的查询方式，删除数据请求gfs接口处理

Browse Source
web_backend_develope
chenlw 8 years ago
parent 65afcb67e9
commit c2773b1d4c
8 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File

4
src/com/dao/mapper/dataInfoMoveTmpmapper.xml
Unescape View File

@ -62,7 +62,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
b.collection_time collectingTime,b.collector_name collectorName,b.collector_contacts collectorContacts,
b.data_year year,b.extract_status extractStatus,b.start_year startYear,b.end_year endYear,
b.volume_ip volumeIp,b.volume_path volumePath,b.checkout_pay payResult,b.checkout_indicate execResult,
b.start_month startMonth,b.end_month endMonth
b.start_month startMonth,b.end_month endMonth,a.fkid fkid
FROM
move_data_tmp a LEFT JOIN data_details b
ON a.system_code = b.system_code AND a.regionalism_code = b.regionalism_code AND a.fkid = b.id
@ -73,7 +73,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
<select id="findById" parameterType ="java.lang.Integer" resultType="com.platform.entities.DataInfoEntityMoveTmp">
SELECT
a.id id,a.regionalism_code regionalismCode,a.dst_path dstPath,a.complete_status completeStatus,
a.rate rate, a.lasttime lastTime, a.system_code systemCode,a.dst_volume_ip dstVolumeIp,a.dst_volume_path dstVolumePath a.add_data addData
a.rate rate, a.lasttime lastTime, a.system_code systemCode,a.dst_volume_ip dstVolumeIp,a.dst_volume_path dstVolumePath,a.fkid fkid,a.add_data addData
FROM
move_data_tmp a
<where>

24
src/com/platform/controller/DataModelController.java
Unescape View File

@ -42,6 +42,7 @@ import com.platform.service.IVolumeService;
import com.platform.service.OracleExtractTask;
import com.platform.service.OracleStatusService;
import com.platform.utils.Constant;
import com.platform.utils.ThreadVolumeImm;
import com.platform.utils.UtilsHelper;
/**
@ -216,8 +217,9 @@ public class DataModelController extends BaseController {
@RequestMapping(value = "/volume/list", method = RequestMethod.POST)
@ResponseBody
public String volumeList() throws Exception {
log.debug("-----/volume/list------");
log.info("-----/volume/list------");
String rest = volumeService.getAllvolume();
new ThreadVolumeImm("ThreadVolumeImm-in-VolumeController-volumeList").start();
return rest;
}
@ -241,7 +243,7 @@ public class DataModelController extends BaseController {
}
datas.addAll(selectItems);
log.debug("------/volume/{name}/move--------");
log.info("------/volume/{name}/move--------");
if (datas.size() > 0) {
moveDataService.moveData(datas, form.getSelectNode());
}
@ -259,7 +261,7 @@ public class DataModelController extends BaseController {
@RequestMapping(value = "/oracle/{name}/extract", method = RequestMethod.POST)
public void oracleExtract(HttpServletRequest res, HttpServletResponse req,
@RequestBody oracleForm form) throws Exception {
log.error("/oracle/{name}/extract");
log.info("/oracle/{name}/extract");
if (null != form.getTarget()) { // 检查请求参数中是否包含汇总库信息
boolean isConnect = OracleExtract.isConnectTotalOracle(form
.getTarget()); // 检查汇总库是否可以连接成功，连接成功返回200状态吗，连接失败返回500状态吗
@ -290,7 +292,7 @@ public class DataModelController extends BaseController {
@RequestMapping(value = "/oracle/list", method = RequestMethod.POST)
@ResponseBody
public List<GatherOracleInfo> oracleList() throws Exception {
log.debug("----------getOracleInfo-----------------------");
log.info("----------getOracleInfo-----------------------");
List<GatherOracleInfo> result = mySqlService.findAllOracle();
return result;
}
@ -306,7 +308,7 @@ public class DataModelController extends BaseController {
@RequestMapping(value = "/oracle/{id}/delete", method = RequestMethod.POST)
public void oracleDelete(HttpServletRequest req, HttpServletResponse res,
@PathVariable String id) throws Exception {
log.debug("----------deleteOracleInfo----------------");
log.info("----------deleteOracleInfo----------------");
Integer num = Integer.valueOf(id);
Integer result = mySqlService.deleteOracle(num);
log.info("oracleDelete : " + result);
@ -327,7 +329,7 @@ public class DataModelController extends BaseController {
public void oracleInsert(HttpServletRequest res, HttpServletResponse req,
@PathVariable String id, @RequestBody GatherOracleInfo oracle)
throws Exception {
log.debug("----------insertOracleInfo----------------");
log.info("----------insertOracleInfo----------------");
oracle.setId(Integer.valueOf(id));
mySqlService.insertOracle(oracle);
req.setStatus(200);
@ -347,8 +349,8 @@ public class DataModelController extends BaseController {
public void oracleUpdate(HttpServletRequest res, HttpServletResponse req,
@PathVariable("id") String id, @RequestBody GatherOracleInfo oracle)
throws Exception {
log.debug("----------updateOracleInfo-----------------------");
log.debug(oracle);
log.info("----------updateOracleInfo-----------------------");
log.info(oracle);
mySqlService.updateOracle(oracle);
req.setStatus(200);
}
@ -380,7 +382,7 @@ public class DataModelController extends BaseController {
@ResponseBody
public Object taskTransferDelete(HttpServletRequest res,
HttpServletResponse req, @PathVariable String id) throws Exception {
log.debug("----------/task/transfer/{id}/delete-----------------------");
log.info("----------/task/transfer/{id}/delete-----------------------");
DataInfoEntityMoveTmp move = new DataInfoEntityMoveTmp();
move.setId(Integer.valueOf(id));
int result = moveDataService.delete(move);
@ -402,7 +404,7 @@ public class DataModelController extends BaseController {
public Object taskTransferSave(HttpServletRequest res,
HttpServletResponse req, @RequestBody DataInfoEntity move)
throws Exception {
log.debug("---------/task/transfer/save-----------------------");
log.info("---------/task/transfer/save-----------------------");
// int result = dfs.save(move);
req.setStatus(200);
return 1;
@ -417,7 +419,7 @@ public class DataModelController extends BaseController {
@RequestMapping(value = "/code/list", method = RequestMethod.POST)
@ResponseBody
public Object findCodeList() throws Exception {
log.debug("---------/findSystemCode-----------------------");
log.info("---------/findSystemCode-----------------------");
Map<String, Object> result = codeService.findAll();
return result;
}

8
src/com/platform/controller/VolumeController.java
Unescape View File

@ -43,7 +43,8 @@ public class VolumeController extends BaseController{
@ResponseBody
public String volumeUpdate(HttpServletRequest res, HttpServletResponse req,
@RequestBody VolumeDataEntity form) throws Exception {
log.error("/oracle/update");
log.info("/oracle/update");
new ThreadVolumeImm("ThreadVolumeImm-in-VolumeController-update").start();
int rest = volumeService.save(form);
if (rest == 1) {
req.setStatus(200);
@ -52,7 +53,6 @@ public class VolumeController extends BaseController{
req.setStatus(500);
}
String result = volumeService.getAllvolume();
new ThreadVolumeImm("ThreadVolumeImm-in-VolumeController-update").start();
return result;
}
@ -67,7 +67,8 @@ public class VolumeController extends BaseController{
@ResponseBody
public String volumeDelete(HttpServletRequest res, HttpServletResponse req,
@RequestBody VolumeDataEntity entity) throws Exception {
log.error("/volume/delete");
log.info("/volume/delete");
new ThreadVolumeImm("ThreadVolumeImm-in-VolumeController-delete").start();
int rest = volumeService.delete(entity);
if (rest == 1) {
req.setStatus(200);
@ -76,7 +77,6 @@ public class VolumeController extends BaseController{
req.setStatus(500);
}
String result = volumeService.getAllvolume();
new ThreadVolumeImm("ThreadVolumeImm-in-VolumeController-delete").start();
return result;
}

29
src/com/platform/http/gfs/RemoveData.java
Unescape View File

@ -31,18 +31,25 @@ public class RemoveData {
Map<String, Object> map = new HashMap<String, Object>();
map.put("removePath", folderName);
//请求 web sendPost
String rest = ht.sendPost("data/removeData", map);
if (null == rest || "".equals(rest)) {
log.error(" --- gluster is disconnect ! \n");
return 0;
String rest = "";
try {
//请求 web sendPost
rest = ht.sendPost("data/removeData", map);
if (null == rest || "".equals(rest)) {
log.error(" --- gluster is disconnect ! \n");
return 0;
}
Gson gs = new Gson();
PostData data = gs.fromJson(rest, PostData.class);
// 1 : 成功
double copyResult = (double) data.getData();
reslut = (int) copyResult;
getExcept(data);
} catch (Exception e) {
log.error(rest);
log.error(e);
}
Gson gs = new Gson();
PostData data = gs.fromJson(rest, PostData.class);
// 1 : 成功
double copyResult = (double) data.getData();
reslut = (int) copyResult;
getExcept(data);
return reslut;
}

28
src/com/platform/oracle/OracleConnector.java
Unescape View File

@ -122,23 +122,15 @@ public class OracleConnector {
Statement statement = null;
try {
statement = conn.createStatement();
statement.executeUpdate(sql);
int res = statement.executeUpdate(sql);
flag = true;
FileOperateHelper.fileWrite(filePath + ".log", sql + "\r\n" + flag
FileOperateHelper.fileWrite(filePath + ".log", sql + "\r\n执行结果：" + res
+ " \r\n");
} catch (SQLException e) {
flag = false;
FileOperateHelper.fileWrite(filePath + ".log",
sql + "\r\n" + e.getMessage() + "\r\n");
log.error(Custom4exception.OracleSQL_Except, e);
} finally {
if (null != statement) {
try {
statement.close();
} catch (SQLException e) {
log.error(Custom4exception.OracleSQL_Except, e);
}
}
}
return flag ;
@ -160,25 +152,17 @@ public class OracleConnector {
Statement statement = null;
try {
statement = conn.createStatement();
statement.executeUpdate(sql);
int res = statement.executeUpdate(sql);
flag = true;
FileOperateHelper.fileWrite(filePath + ".log", sql + "\r\n"
+ "OK \r\n");
FileOperateHelper.fileWrite(filePath + ".log", sql + "\r\n 执行结果："+ res
+ " \r\n");
} catch (SQLException e) {
flag = false;
FileOperateHelper.fileWrite(filePath + ".log",
sql + "\r\n" + e.getMessage() + "\r\n");
log.error(Custom4exception.OracleSQL_Except, e);
} finally {
if (null != statement) {
try {
statement.close();
} catch (SQLException e) {
log.error(Custom4exception.OracleSQL_Except, e);
}
}
}
}
return flag;
}
}

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

@ -186,6 +186,10 @@ public class CheckoutServiceImpl implements ICheckoutService {
}
}
resultList.addAll(noDataList);
int listSize = resultList.size();
for (int i = 0; i < listSize; i++) {
resultList.get(i).setId(i);
}
return resultList;
}

7
src/com/platform/service/thread/ThreadMoveData.java
Unescape View File

@ -401,7 +401,12 @@ public class ThreadMoveData{
}
data.setPayResult(dataMove.getPayResult());
data.setExecResult(dataMove.getExecResult());
data.setSrcId(dataMove.getFkid());
if (movetmp.getFkid() > 0) {
data.setSrcId(movetmp.getFkid());
}
else {
data.setSrcId(dataMove.getFkid());
}
data.setId(0);
try {
if (dataInfoDao.countByDataPath(data) == 0) {

6
src/com/platform/utils/ThreadVolume.java
Unescape View File

@ -38,16 +38,14 @@ public class ThreadVolume extends Thread {
@Override
public void run() {
super.run();
while (true) {
// while (true) {
try {
vo.getVolumeMsg();
Thread.sleep(Constant.get_volume_sleep_time);
} catch (Exception e) {
log.error(Custom4exception.threadVolume_Thread_Except, e);
}
}
// }
}

Write Preview
Loading…
Cancel
Save