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/utils/FileOperateHelper.java

WebContent/WEB-INF/config/log4j-config.xml

@@ -14,7 +14,7 @@
 	<appender name="dailyRollingFile" class="org.apache.log4j.DailyRollingFileAppender">
 		<param name="Threshold" value="info"></param>
 		<param name="ImmediateFlush" value="true"></param>
-		<param name="File" value="C:\\logs/dailyRollingFile.log"></param>
+		<param name="File" value="D:\\logs/dailyRollingFile.log"></param>
 		<param name="DatePattern" value="'.'yyyy-MM-dd'.log'"></param>
 		<layout class="org.apache.log4j.PatternLayout">
 			<param name="ConversionPattern" value="[%d{yyyy-MM-dd HH:mm:ss\} %-5p] [%t] {%c:%L}-%m%n"></param>

src/com/base/CustomException.java

@@ -94,7 +94,7 @@ public class CustomException extends Exception {
 		
 		sbuf.append("\r\n");
 		// 是否 写入 文件
-		log.error(sbuf.toString());
+		log.debug(sbuf.toString());
 	}
 
 	/**

src/com/platform/controller/DataModelController.java

@@ -98,7 +98,8 @@ public class DataModelController extends BaseController{
 	}
 
 	@RequestMapping(value = "/delete/data", method = RequestMethod.POST)
-	public void deleteData(HttpServletRequest res, HttpServletResponse req) throws Exception {
+	public void deleteData(HttpServletRequest res, HttpServletResponse req)
+			throws Exception {
 		res.setCharacterEncoding("UTF-8");
 		Map<String, String[]> paramMap = res.getParameterMap();
 		String[] data = paramMap.get("data");
@@ -107,7 +108,8 @@ public class DataModelController extends BaseController{
 	}
 
 	@RequestMapping("/connectOracle")
-	public void connectOracle(HttpServletRequest res, HttpServletResponse req) throws UnsupportedEncodingException {
+	public void connectOracle(HttpServletRequest res, HttpServletResponse req)
+			throws UnsupportedEncodingException {
 		res.setCharacterEncoding("UTF-8");
 		Map<String, String[]> paramMap = res.getParameterMap();
 		String[] oraclesName = paramMap.get("oracleName");
@@ -136,17 +138,20 @@ public class DataModelController extends BaseController{
 	}
 
 	@RequestMapping(value = "/oracle/{name}/extract", method = RequestMethod.POST)
-	public void oracleExtract(HttpServletRequest res,
+	public void oracleExtract(HttpServletRequest res, HttpServletResponse req,
-			HttpServletResponse req,@RequestBody oracleForm form) throws Exception {
+			@RequestBody oracleForm form) throws Exception {
 		Configs.CONSOLE_LOGGER.error("/oracle/{name}/extract");
 		res.setCharacterEncoding("UTF-8");
 		if (null != form.getInneed() && form.getInneed().size() > 0) {
-			OracleExtract.extractOracle(form.getName(), form.getInneed(), form.getTarget());
+			OracleExtract.extractOracle(form.getName(), form.getInneed(),
+					form.getTarget());
 		}
 		req.setStatus(200);
 	}
+
 	// public void oracleExtract(HttpServletRequest res,
-//			HttpServletResponse req, String name, @RequestBody GatherOracleInfo gather, @RequestBody List<OracleConnectorParams> collectOracles)
+	// HttpServletResponse req, String name, @RequestBody GatherOracleInfo
+	// gather, @RequestBody List<OracleConnectorParams> collectOracles)
 	// throws Exception {
 	// // res.setCharacterEncoding("UTF-8");
 	// log.debug("------extract-------");
@@ -163,7 +168,8 @@ public class DataModelController extends BaseController{
 	// //
 	// // // 采集库对象--(多个采集库抽取到1个汇总库的1个tableName下)
 	// // String[] inneed = paramMap.get("inneed");
-////		List<Map<String, String>> colleclist = new ArrayList<Map<String,String>>();
+	// // List<Map<String, String>> colleclist = new
+	// ArrayList<Map<String,String>>();
 	// // for (String string : nodes) {
 	// // JSONObject jsonobject = JSONObject.fromObject(string);
 	// // Map inneedMap = jsonobject;
@@ -182,7 +188,8 @@ public class DataModelController extends BaseController{
 
 	@RequestMapping(value = "/volume/{name}/move", method = RequestMethod.POST)
 	@ResponseBody
-	public void volumeMove(HttpServletRequest res, HttpServletResponse req,@RequestBody volumeMoveForm form) throws Exception {
+	public void volumeMove(HttpServletRequest res, HttpServletResponse req,
+			@RequestBody volumeMoveForm form) throws Exception {
 		List<DataInfoEntity> datas = new ArrayList<DataInfoEntity>();
 		List<DataInfoEntity> selectItems = form.getSelectItems();
 		if (null == selectItems) {
@@ -207,7 +214,8 @@ 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 {
+	public void oracleDelete(HttpServletRequest req, HttpServletResponse res,
+			@PathVariable String id) throws Exception {
 		log.debug("----------deleteOracleInfo----------------");
 		Integer num = Integer.valueOf(id);
 		Integer result = mySqlService.deleteMySql(num);
@@ -217,7 +225,9 @@ public class DataModelController extends BaseController{
 
 	@RequestMapping(value = "/oracle/{id}/insert", method = RequestMethod.POST)
 	@ResponseBody
-	public void oracleInsert(HttpServletRequest res, HttpServletResponse req, @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);
@@ -226,7 +236,9 @@ public class DataModelController extends BaseController{
 
 	@RequestMapping(value = "/oracle/{id}/update", method = RequestMethod.POST)
 	@ResponseBody
-	public void oracleUpdate(HttpServletRequest res, HttpServletResponse req, @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);
@@ -243,7 +255,8 @@ public class DataModelController extends BaseController{
 
 	@RequestMapping(value = "/task/transfer/{id}/delete", method = RequestMethod.POST)
 	@ResponseBody
-	public Object taskTransferDelete(HttpServletRequest res, HttpServletResponse req, @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));
@@ -254,7 +267,9 @@ public class DataModelController extends BaseController{
 
 	@RequestMapping(value = "/task/transfer/save", method = RequestMethod.POST)
 	@ResponseBody
-	public Object taskTransferSave(HttpServletRequest res, HttpServletResponse req, @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);
@@ -271,9 +286,12 @@ public class DataModelController extends BaseController{
 
 	@RequestMapping(value = "/oracle/extract/log", method = RequestMethod.POST)
 	@ResponseBody
-	public Object getExtractLog(@RequestParam("rcName") String name, HttpServletRequest res, HttpServletResponse req) throws Exception{
+	public Object getExtractLog(@RequestParam("rcName") String name,
+			HttpServletRequest res, HttpServletResponse req) throws Exception {
 		log.info("---------/oracle/extract/log-------------------");
 		String result = logReadService.readLog(name);
+		// StringBuilder sb = new StringBuilder();
+		// sb.append("查看相应日志").append("\n").append("看到了");
 		Map<String, String> log = new HashMap<>();
 		log.put(name, result);
 		return log;

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

@@ -12,7 +12,6 @@ public class LogReadServiceImpl implements ILogRead {
 
 	@Override
 	public String readLog(String filename) throws Exception {		
-		
 		String result = FileOperateHelper.fileReader(Configs.EXTRACT_LOG_LOCALTION + "J" + filename.replace("-", "_")+".log");		
 		return result;
 	}

src/com/platform/utils/FileOperateHelper.java

@@ -4,7 +4,6 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
@@ -55,17 +54,14 @@ public class FileOperateHelper {
 		try {
 			File file = new File(path);			
 			if (!file.exists())
-				return "";
+				return "当前没有日志信息！";
-			FileReader f =new FileReader(path);
+			FileInputStream fis = new FileInputStream(file);
-	        BufferedReader br =new BufferedReader(f);
+			BufferedReader br = new BufferedReader(new InputStreamReader(fis,"UTF-8"));
-//			FileInputStream fis = new FileInputStream(file);
-//			BufferedReader br = new BufferedReader(new InputStreamReader(fis));
-//			BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
 			while ((tempString = br.readLine()) != null) {
 				sb.append(tempString).append("\r\n");
 			}
 		} catch (Exception e) {
-			// TODO: handle exception
+			Configs.CONSOLE_LOGGER.info(e.getMessage());
 		}
 		return sb.toString();
 	}