调试修改代码-联调

src/com/base/Custom4exception.java

@@ -26,4 +26,9 @@ public class Custom4exception {
 	 */
 	public final static String threadVolume_Thread_Except = "3001001002";
 	
+	/**
+	 * 抽取汇总
+	 */
+	public final static String threadVolume_Oracle_Except = "3002001002";
+	
 }

src/com/platform/controller/DataModelController.java

@@ -30,6 +30,7 @@ import com.platform.entities.FolderNode;
 import com.platform.entities.GatherOracleInfo;
 import com.platform.entities.PagerOptions;
 import com.platform.entities.VolumeEntity;
+import com.platform.entities.volumeMoveForm;
 import com.platform.service.DataInfoService;
 import com.platform.service.ICodeService;
 import com.platform.service.IGfsService;
@@ -100,6 +101,7 @@ public class DataModelController extends BaseController{
 		Map<String, String[]> paramMap = res.getParameterMap();
 		String[] data = paramMap.get("data");
 		dfs.deleteData(data);
+		req.setStatus(200);
 	}
 
 	@RequestMapping("/connectOracle")
@@ -112,6 +114,7 @@ public class DataModelController extends BaseController{
 				Configs.CONSOLE_LOGGER.info("连接成功\t" + rcName);
 				new OracleStatusService().connectToOracle(rcName);
 			}
+		req.setStatus(200);
 	}
 
 	@RequestMapping("/cancelOracleConection")
@@ -127,6 +130,7 @@ public class DataModelController extends BaseController{
 				new OracleStatusService().cancelToOracle(rcName, operate);
 			}
 		}
+		req.setStatus(200);
 	}
 
 	@RequestMapping(value="/oracle/{name}/extract", method= RequestMethod.POST)
@@ -154,7 +158,7 @@ public class DataModelController extends BaseController{
 			colleclist.add(inneedMap);
 		}
 		OracleExtract.extractOracle(name, colleclist, map);
-		
+		req.setStatus(200);
 	}
 //	public void oracleExtract(HttpServletRequest res,
 //			HttpServletResponse req, String name, @RequestBody GatherOracleInfo gather, @RequestBody List<OracleConnectorParams> collectOracles)
@@ -192,37 +196,45 @@ public class DataModelController extends BaseController{
 	}
 	
 	@RequestMapping(value = "/volume/{name}/move", method= RequestMethod.POST)
-	public void volumeMove(HttpServletRequest res, HttpServletResponse req,@PathVariable String name, 
+	@ResponseBody
-			FolderNode selectNode, DataInfoEntity selectItems) throws Exception {
+	public void volumeMove(HttpServletRequest res, HttpServletResponse req,@RequestBody volumeMoveForm form) throws Exception {
-		res.setCharacterEncoding("UTF-8");
+//		res.setCharacterEncoding("UTF-8");
-		System.out.println("get Request");
+//		System.out.println("get Request");
-		Map<String, String[]> paramMap = res.getParameterMap();
+//		Map<String, String[]> paramMap = res.getParameterMap();
-//		System.out.println(paramMap);
+////		System.out.println(paramMap);
-		String[] nodes = paramMap.get("selectNode");
+//		String[] nodes = paramMap.get("selectNode");
-		Map map = null;
+//		Map map = null;
-		for (String string : nodes) {
+//		for (String string : nodes) {
-			System.out.println(string);
+//			System.out.println(string);
-			JSONObject jsonobject = JSONObject.fromObject(string);
+//			JSONObject jsonobject = JSONObject.fromObject(string);
-			map = jsonobject;
+//			map = jsonobject;
-		}
+//		}
-		String dstVolume = (String) map.get("volume");
+//		String dstVolume = (String) map.get("volume");
 		
-		List<String> listItemPath = new ArrayList<String>();
+//		List<String> listItemPath = new ArrayList<String>();
-		String[] items = paramMap.get("selectItems");
+//		String[] items = paramMap.get("selectItems");
-		System.out.println("selectItems");
+//		System.out.println("selectItems");
 		List<DataInfoEntity> datas = new ArrayList<DataInfoEntity>();
-		List<String> srcVolumes = new ArrayList<String>();
+//		List<String> srcVolumes = new ArrayList<String>();
-		for (String string : items) {
+//		for (String string : items) {
-			System.out.println(string);
+//			System.out.println(string);
-			JSONObject jsobj = JSONObject.fromObject(string);
+//			JSONObject jsobj = JSONObject.fromObject(string);
-			Map itemmap = jsobj;
+//			Map itemmap = jsobj;
-			DataInfoEntity data = (DataInfoEntity) Bean2MapUtils.convertMap(DataInfoEntity.class, itemmap);
+//			DataInfoEntity data = (DataInfoEntity) Bean2MapUtils.convertMap(DataInfoEntity.class, itemmap);
-			datas.add(data);
+//			datas.add(data);
+//		}
+		List<DataInfoEntity> selectItems = form.getSelectItems();
+		if (null == selectItems) {
+			req.setStatus(200);
+			return;
 		}
+		datas.addAll(selectItems);
+		
 		System.out.println("------/volume/{name}/move--------");
 		if (datas.size() >0) {
-			moveDataService.moveData(datas, (String)map.get("path"));
+			moveDataService.moveData(datas, form.getSelectNode());
 		}
+		req.setStatus(200);
 	}
 //	public Object volumeMove(HttpServletRequest res, HttpServletResponse req, String name, 
 //			@RequestBody FolderNode selectNode, @RequestBody List<DataInfoEntity> selectItems) throws Exception {
@@ -256,26 +268,30 @@ public class DataModelController extends BaseController{
 	}
 	
 	@RequestMapping(value="/oracle/{id}/delete", method= RequestMethod.POST)
-	public void oracleDelete(@PathVariable String id) throws Exception {
+	public void oracleDelete(HttpServletRequest req, HttpServletResponse res, @PathVariable String id) throws Exception {
 		log.debug("----------deleteOracleInfo----------------");
 		Integer num = Integer.valueOf(id);
-		mySqlService.deleteMySql(num); 
+		Integer result = mySqlService.deleteMySql(num); 
+		log.info("oracleDelete : " + result);
+		res.setStatus(200);
 	}
 	
 	@RequestMapping(value="/oracle/{id}/insert", method= RequestMethod.POST)
 	@ResponseBody
-	public void oracleInsert(@PathVariable String id, @RequestBody GatherOracleInfo oracle) throws Exception {
+	public void oracleInsert(HttpServletRequest res, HttpServletResponse req, @PathVariable String id, @RequestBody GatherOracleInfo oracle) throws Exception {
 		log.debug("----------insertOracleInfo----------------");
 		oracle.setId(Integer.valueOf(id));
 		mySqlService.insertOracle(oracle);
+		req.setStatus(200);
 	}
 	
 	@RequestMapping(value="/oracle/{id}/update", method= RequestMethod.POST)
 	@ResponseBody
-	public void oracleUpdate(@PathVariable("id") String id, @RequestBody GatherOracleInfo oracle) throws Exception {
+	public void oracleUpdate(HttpServletRequest res, HttpServletResponse req, @PathVariable("id") String id, @RequestBody GatherOracleInfo oracle) throws Exception {
 		log.debug("----------updateOracleInfo-----------------------");
 		log.debug(oracle);
 		mySqlService.updateOracle(oracle); 
+		req.setStatus(200);
 	}
 	
 	@RequestMapping(value="/task/transfer/list", method= RequestMethod.POST)
@@ -288,19 +304,21 @@ public class DataModelController extends BaseController{
 	
 	@RequestMapping(value="/task/transfer/{id}/delete", method= RequestMethod.POST)
 	@ResponseBody
-	public Object taskTransferDelete(@PathVariable String id) throws Exception {
+	public Object taskTransferDelete(HttpServletRequest res, HttpServletResponse req, @PathVariable String id) throws Exception {
 		log.debug("----------/task/transfer/{id}/delete-----------------------");
 		DataInfoEntityMoveTmp move = new DataInfoEntityMoveTmp();
 		move.setId(Integer.valueOf(id));
 		int result = moveDataService.delete(move );
+		req.setStatus(200);
 		return result;
 	}
 	
 	@RequestMapping(value="/task/transfer/save", method= RequestMethod.POST)
 	@ResponseBody
-	public Object taskTransferSave(@RequestBody DataInfoEntity move) throws Exception {
+	public Object taskTransferSave(HttpServletRequest res, HttpServletResponse req, @RequestBody DataInfoEntity move) throws Exception {
 		log.debug("---------/task/transfer/save-----------------------");
 		int result = dfs.save(move);
+		req.setStatus(200);
 		return result;
 	}
 	

src/com/platform/entities/volumeMoveForm.java

@@ -0,0 +1,54 @@
+package com.platform.entities;
+
+import java.util.List;
+
+public class volumeMoveForm {
+	
+	private String name;
+	
+	private FolderNode selectNode;
+	
+	private List<DataInfoEntity> selectItems;
+
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * @param name the name to set
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * @return the selectNode
+	 */
+	public FolderNode getSelectNode() {
+		return selectNode;
+	}
+
+	/**
+	 * @param selectNode the selectNode to set
+	 */
+	public void setSelectNode(FolderNode selectNode) {
+		this.selectNode = selectNode;
+	}
+
+	/**
+	 * @return the selectItems
+	 */
+	public List<DataInfoEntity> getSelectItems() {
+		return selectItems;
+	}
+
+	/**
+	 * @param selectItems the selectItems to set
+	 */
+	public void setSelectItems(List<DataInfoEntity> selectItems) {
+		this.selectItems = selectItems;
+	}
+}

src/com/platform/service/IMoveDataService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.platform.entities.DataInfoEntity;
 import com.platform.entities.DataInfoEntityMoveTmp;
+import com.platform.entities.FolderNode;
 
 /** 数据迁移
  * @author chen
@@ -17,7 +18,7 @@ public interface IMoveDataService {
 	 * @return
 	 * @throws Exception
 	 */
-	public boolean moveData(List<DataInfoEntity> data, String dstPath) throws Exception;
+	public boolean moveData(List<DataInfoEntity> data, FolderNode folder) throws Exception;
 	
 	/** 查询所有进度
 	 * @return 返回所有的实体

src/com/platform/service/OracleExtractHelper.java

@@ -4,6 +4,8 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import com.base.Custom4exception;
+import com.base.CustomException;
 import com.platform.entities.GatherOracleInfo;
 import com.platform.entities.OracleConnectorParams;
 import com.platform.oracle.OracleConnector;
@@ -40,18 +42,8 @@ public class OracleExtractHelper {
 	/**
 	 * 创建dblink
 	 * 
-<<<<<<< HEAD
-<<<<<<< HEAD
-	 * @param conn
-	 * @param oc
-=======
-	 * @param conn 汇总库的连接
-	 * @param oc 采集库
->>>>>>> 355b6e47a4fa8d058029ec939fe4fefdaa751275
-=======
 	 * @param conn 汇总库的连接
 	 * @param oc 采集库
->>>>>>> web_backend_develope
 	 *            dblink连接参数实体
 	 */
 	public void createDBLink(Connection conn, OracleConnectorParams oc) {
@@ -73,15 +65,15 @@ public class OracleExtractHelper {
 				FileOperateHelper
 						.fileWrite(
 								Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
-								deleteSql);
+								deleteSql+"\r\n");
 				if (oConnector.execOracleSQL(conn, deleteSql)) {
 					FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION
-							+ oc.getName(), sql);
+							+ oc.getName(), sql+"\r\n");
 					oConnector.execOracleSQL(conn, sql);
 				} else {
 					Configs.CONSOLE_LOGGER.error("删除已有的DBLink失败,无法创建新的DBLink!");
 					FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION
-							+ oc.getName(), "删除已有的DBLink失败,无法创建新的DBLink!");
+							+ oc.getName(), "删除已有的DBLink失败,无法创建新的DBLink!"+"\r\n");
 				}
 
 			} else {
@@ -104,12 +96,20 @@ public class OracleExtractHelper {
 		String tmpSql = "select TABLESPACE_NAME from dba_tablespaces where TABLESPACE_NAME = '"
 				+ Configs.GATHER_TABLESPACE_NAME + "'";
 		if (oConnector.execOracleSQL(conn, tmpSql)) {
+			FileOperateHelper
+			.fileWrite(
+					Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
+					tmpSql+"\r\n");
 			return true;
 		} else {
 			String sql = "create tablespace " + Configs.GATHER_TABLESPACE_NAME
 					+ " datafile '" + Configs.GATHER_TABLESPACE_PATH
 					+ Configs.GATHER_TABLESPACE_NAME + ".dbf"
 					+ "' size 512M autoextend on next 512M maxsize unlimited";
+			FileOperateHelper
+			.fileWrite(
+					Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
+					sql+"\r\n");
 			return oConnector.execOracleSQL(conn, sql);
 		}
 	}
@@ -126,8 +126,18 @@ public class OracleExtractHelper {
 				+ Configs.GATHER_TABLESPACE_NAME + " identified by "
 				+ Configs.GATHER_TABLE_PASSWORD;
 		String grantSql = "grant connect, resource, dba to " + strTUser;
+		
 		oConnector.execOracleSQL(conn, sql);
+		FileOperateHelper
+		.fileWrite(
+				Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
+				sql+"\r\n");
+		
 		oConnector.execOracleSQL(conn, grantSql);
+		FileOperateHelper
+		.fileWrite(
+				Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
+				grantSql+"\r\n");
 	}
 
 	/**
@@ -149,14 +159,21 @@ public class OracleExtractHelper {
 				+ " and t.owner||t.table_name not in (select owner||table_name from dba_tables@linkTo"
 				+ oc.getName() + " where 'data_type'='CLOB')";
 		ResultSet rsSet = oConnector.getSQLExecResultSet(conn, sql);
+		FileOperateHelper
+		.fileWrite(
+				Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
+				sql+"\r\n");
 		try {
 			while (rsSet.next()) {
 				String resultSql = rsSet.getString(0);
 				oConnector.execOracleSQL(conn, resultSql);
+				FileOperateHelper
+				.fileWrite(
+						Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
+						resultSql+"\r\n");
 			}
 		} catch (SQLException e) {
-			// TODO Auto-generated catch block
+			new CustomException(Custom4exception.threadVolume_Oracle_Except, e);
-			e.printStackTrace();
 		}
 
 	}

src/com/platform/service/impl/MoveDataServiceImpl.java

@@ -16,6 +16,7 @@ import com.platform.dao.DataInfoDao;
 import com.platform.dao.DataInfoMoveTmpDao;
 import com.platform.entities.DataInfoEntity;
 import com.platform.entities.DataInfoEntityMoveTmp;
+import com.platform.entities.FolderNode;
 import com.platform.glusterfs.CheckoutMD5;
 import com.platform.glusterfs.CopyData;
 import com.platform.glusterfs.RemoveData;
@@ -53,7 +54,7 @@ public class MoveDataServiceImpl implements IMoveDataService {
 	ShowData show = new ShowData();
 
 	@Override
-	public boolean moveData(List<DataInfoEntity> data, String dstPath)
+	public boolean moveData(List<DataInfoEntity> data, FolderNode node)
 			throws Exception {
 		boolean isSuccess = false;
 		String tailPath = "";
@@ -77,6 +78,7 @@ public class MoveDataServiceImpl implements IMoveDataService {
 					.compile("\\/\\d+[a-z]*[A-Z]*_\\d+\\/\\d*\\/*$");
 			// 末尾 含有 /
 			Pattern pattern2 = Pattern.compile("\\/$");
+			String dstPath = node.getPath();
 			Matcher matcher2 = pattern2.matcher(dstPath);
 			// 去掉 最后 的 / 符合
 			if (matcher2.find()) {
@@ -106,6 +108,7 @@ public class MoveDataServiceImpl implements IMoveDataService {
 				dataMove.setDstPath(finalDestPath);
 				dataMove.setLastTime(DateForm.date2StringBysecond(new Date()));
 				dataMove.setFkid(dataInfoEntity.getId());
+				dataMove.setVolumePath(node.getName());
 				moveList.add(dataMove);
 			}
 			if (moveList.size() > 0) {
@@ -130,11 +133,23 @@ public class MoveDataServiceImpl implements IMoveDataService {
 
 	@Override
 	public int delete(DataInfoEntityMoveTmp dataMove) throws Exception {
-		if ("1".equals(dataMove.getCompleteStatus())
+		List<DataInfoEntityMoveTmp> list = dataInfoMoveTmpDao.findAll();
-				|| "3".equals(dataMove.getCompleteStatus())) {
+		if (null != list) {
+			for (DataInfoEntityMoveTmp dataInfoEntityMoveTmp : list) {
+				if (dataMove.getId() == dataInfoEntityMoveTmp.getId()) {
+					dataMove = dataInfoEntityMoveTmp;
+					break;
+				}
+			}
+			
+		}
+		if ("3".equals(dataMove.getCompleteStatus())) {
 			removeservice.deleteFolder(dataMove.getDstPath());
 		}
-		int result = dataInfoMoveTmpDao.remove(dataMove.getId());
+		int result = 0;
+		if (!"1".equals(dataMove.getCompleteStatus())) {
+			result = dataInfoMoveTmpDao.remove(dataMove.getId());
+		}
 		return result;
 	}
 

src/com/platform/utils/Constant.java

@@ -5,7 +5,7 @@ package com.platform.utils;
 public class Constant {
 	public static String rootUser = "root";
 	public static String rootPasswd = "root";
-	public static String hostIp = "192.168.0.116";
+	public static String hostIp = "192.168.0.110";
 	// public static String hostIp = "192.168.1.105";
 	public static int port = 22;
 	public static String glusterPeerStatus = "gluster peer status";
@@ -39,7 +39,7 @@ public class Constant {
 		/**
 		 * volume 获取的线程休眠时间
 		 */
-		public final static int get_volume_sleep_time = 180000;
+		public final static int get_volume_sleep_time = 600000;
 		
 		/**
 		 * volume 获取的线程休眠时间

src/com/platform/websocket/SystemWebSocketHandler.java

@@ -1,51 +0,0 @@
-package com.platform.websocket;
-
-import org.springframework.web.socket.CloseStatus;
-import org.springframework.web.socket.TextMessage;
-import org.springframework.web.socket.WebSocketHandler;
-import org.springframework.web.socket.WebSocketMessage;
-import org.springframework.web.socket.WebSocketSession;
-
-public class SystemWebSocketHandler implements WebSocketHandler {
-
-	@Override
-	public void afterConnectionClosed(WebSocketSession arg0, CloseStatus arg1)
-			throws Exception {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void afterConnectionEstablished(WebSocketSession arg0)
-			throws Exception {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void handleMessage(WebSocketSession arg0, WebSocketMessage<?> arg1)
-			throws Exception {
-		// TODO Auto-generated method stub
-		TextMessage returnMessage = new TextMessage("received at server"); 
-		sendMessageToUsers(returnMessage);
-		System.out.println("接到请求");
-	}
-
-	@Override
-	public void handleTransportError(WebSocketSession arg0, Throwable arg1)
-			throws Exception {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public boolean supportsPartialMessages() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-	
-	 public void sendMessageToUsers(TextMessage message) {  
-      
-     }   
-
-}

src/com/platform/websocket/WebSocketConfig.java

@@ -1,28 +0,0 @@
-package com.platform.websocket;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.web.socket.WebSocketHandler;
-import org.springframework.web.socket.config.annotation.EnableWebSocket;
-import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
-import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
-
-
-@Configuration
-@EnableWebMvc
-@EnableWebSocket
-public class WebSocketConfig extends WebMvcConfigurerAdapter implements WebSocketConfigurer {
-
-	@Override
-	public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-		// TODO Auto-generated method stub		
-		 registry.addHandler(myHandler(), "/webSocketServer"); 
-	}
-
-	@Bean
-	public WebSocketHandler myHandler() {
-		return new SystemWebSocketHandler();
-	}
-}