diff --git a/WebContent/WEB-INF/config/log4j-config.xml b/WebContent/WEB-INF/config/log4j-config.xml index 3a20a710..fb905a3f 100644 --- a/WebContent/WEB-INF/config/log4j-config.xml +++ b/WebContent/WEB-INF/config/log4j-config.xml @@ -14,7 +14,7 @@ - + diff --git a/src/com/base/CustomException.java b/src/com/base/CustomException.java index e59bb6bd..e40f5697 100644 --- a/src/com/base/CustomException.java +++ b/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()); } /** diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java index f768ab08..edd37db6 100644 --- a/src/com/platform/controller/DataModelController.java +++ b/src/com/platform/controller/DataModelController.java @@ -42,31 +42,31 @@ import com.platform.utils.Configs; import com.platform.utils.UtilsHelper; @Controller -public class DataModelController extends BaseController{ - +public class DataModelController extends BaseController { + public static Logger log = Configs.DAILY_ROLLING_LOGGER; - + @Resource(name = "dataInfoService") private DataInfoService dfs; - + @Resource(name = "gfsService") private IGfsService gfsService; - + @Resource(name = "mySqlService") private IMySqlService mySqlService; - + @Resource(name = "OracleExtract") private IOracleExtractService OracleExtract; - + @Resource(name = "moveDataService") private IMoveDataService moveDataService; - + @Resource(name = "codeService") private ICodeService codeService; - + @Resource(name = "logReadService") private ILogRead logReadService; - + public void setDfsImp(DataInfoService dfs) { this.dfs = dfs; } @@ -93,12 +93,13 @@ public class DataModelController extends BaseController{ .append("}").toString()); PagerOptions pagerOptions = (PagerOptions) UtilsHelper .newObjAndSetAttrsByClass(PagerOptions.class, params); - + return dfs.getPagerTableData(pagerOptions); } - @RequestMapping(value="/delete/data", method= RequestMethod.POST) - public void deleteData(HttpServletRequest res, HttpServletResponse req) throws Exception { + @RequestMapping(value = "/delete/data", method = RequestMethod.POST) + public void deleteData(HttpServletRequest res, HttpServletResponse req) + throws Exception { res.setCharacterEncoding("UTF-8"); Map 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 paramMap = res.getParameterMap(); String[] oraclesName = paramMap.get("oracleName"); @@ -135,54 +137,59 @@ public class DataModelController extends BaseController{ req.setStatus(200); } - @RequestMapping(value="/oracle/{name}/extract", method= RequestMethod.POST) - public void oracleExtract(HttpServletRequest res, - HttpServletResponse req,@RequestBody oracleForm form) throws Exception { + @RequestMapping(value = "/oracle/{name}/extract", method = RequestMethod.POST) + public void oracleExtract(HttpServletRequest res, HttpServletResponse req, + @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 collectOracles) -// throws Exception { -//// res.setCharacterEncoding("UTF-8"); -// log.debug("------extract-------"); -//// Map paramMap = res.getParameterMap(); -//// log.debug(paramMap); -//// //汇总库 对象信息--带有tableName- -//// String[] nodes = paramMap.get("target"); -//// Map map = null; -//// for (String string : nodes) { -//// JSONObject jsonobject = JSONObject.fromObject(string); -//// map = jsonobject; -//// System.out.println(map); -//// } -//// -//// // 采集库对象--(多个采集库抽取到1个汇总库的1个tableName下) -//// String[] inneed = paramMap.get("inneed"); -//// List> colleclist = new ArrayList>(); -//// for (String string : nodes) { -//// JSONObject jsonobject = JSONObject.fromObject(string); -//// Map inneedMap = jsonobject; -//// colleclist.add(inneedMap); -//// } -// OracleExtract.extractOracle(name, collectOracles, gather); -// } - - @RequestMapping(value="/volume/list", method= RequestMethod.POST) + + // public void oracleExtract(HttpServletRequest res, + // HttpServletResponse req, String name, @RequestBody GatherOracleInfo + // gather, @RequestBody List collectOracles) + // throws Exception { + // // res.setCharacterEncoding("UTF-8"); + // log.debug("------extract-------"); + // // Map paramMap = res.getParameterMap(); + // // log.debug(paramMap); + // // //汇总库 对象信息--带有tableName- + // // String[] nodes = paramMap.get("target"); + // // Map map = null; + // // for (String string : nodes) { + // // JSONObject jsonobject = JSONObject.fromObject(string); + // // map = jsonobject; + // // System.out.println(map); + // // } + // // + // // // 采集库对象--(多个采集库抽取到1个汇总库的1个tableName下) + // // String[] inneed = paramMap.get("inneed"); + // // List> colleclist = new + // ArrayList>(); + // // for (String string : nodes) { + // // JSONObject jsonobject = JSONObject.fromObject(string); + // // Map inneedMap = jsonobject; + // // colleclist.add(inneedMap); + // // } + // OracleExtract.extractOracle(name, collectOracles, gather); + // } + + @RequestMapping(value = "/volume/list", method = RequestMethod.POST) @ResponseBody public List volumeList() throws Exception { log.debug("-----/volume/list------"); List result = gfsService.getAllVolumes(); return result; } - - @RequestMapping(value = "/volume/{name}/move", method= RequestMethod.POST) + + @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 datas = new ArrayList(); List selectItems = form.getSelectItems(); if (null == selectItems) { @@ -190,90 +197,101 @@ public class DataModelController extends BaseController{ return; } datas.addAll(selectItems); - + System.out.println("------/volume/{name}/move--------"); - if (datas.size() >0) { + if (datas.size() > 0) { moveDataService.moveData(datas, form.getSelectNode()); } req.setStatus(200); } - - @RequestMapping(value="/oracle/list", method= RequestMethod.POST) + + @RequestMapping(value = "/oracle/list", method = RequestMethod.POST) @ResponseBody public List oracleList() throws Exception { log.debug("----------getOracleInfo-----------------------"); - List result = mySqlService.findAllMySql(); + List result = mySqlService.findAllMySql(); return result; } - - @RequestMapping(value="/oracle/{id}/delete", method= RequestMethod.POST) - public void oracleDelete(HttpServletRequest req, HttpServletResponse res, @PathVariable String id) throws Exception { + + @RequestMapping(value = "/oracle/{id}/delete", method = RequestMethod.POST) + 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); + Integer result = mySqlService.deleteMySql(num); log.info("oracleDelete : " + result); res.setStatus(200); } - - @RequestMapping(value="/oracle/{id}/insert", method= RequestMethod.POST) + + @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); req.setStatus(200); } - - @RequestMapping(value="/oracle/{id}/update", method= RequestMethod.POST) + + @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); + mySqlService.updateOracle(oracle); req.setStatus(200); } - - @RequestMapping(value="/task/transfer/list", method= RequestMethod.POST) + + @RequestMapping(value = "/task/transfer/list", method = RequestMethod.POST) @ResponseBody public Object taskTransferList() throws Exception { log.debug("----------/task/transfer/list-----------------------"); List result = moveDataService.findAll(); return result; } - - @RequestMapping(value="/task/transfer/{id}/delete", method= RequestMethod.POST) + + @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)); - int result = moveDataService.delete(move ); + int result = moveDataService.delete(move); req.setStatus(200); return result; } - - @RequestMapping(value="/task/transfer/save", method= RequestMethod.POST) + + @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); return result; } - - @RequestMapping(value="/code/list", method= RequestMethod.POST) + + @RequestMapping(value = "/code/list", method = RequestMethod.POST) @ResponseBody public Object findCodeList() throws Exception { log.debug("---------/findSystemCode-----------------------"); Map result = codeService.findAll(); return result; } - - @RequestMapping(value = "/oracle/extract/log", method= RequestMethod.POST ) + + @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 log = new HashMap<>(); log.put(name, result); return log; diff --git a/src/com/platform/service/impl/LogReadServiceImpl.java b/src/com/platform/service/impl/LogReadServiceImpl.java index b07bb398..2d9dff31 100644 --- a/src/com/platform/service/impl/LogReadServiceImpl.java +++ b/src/com/platform/service/impl/LogReadServiceImpl.java @@ -11,10 +11,9 @@ 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"); + public String readLog(String filename) throws Exception { + String result = FileOperateHelper.fileReader(Configs.EXTRACT_LOG_LOCALTION + "J" + filename.replace("-", "_")+".log"); return result; } -} +} \ No newline at end of file diff --git a/src/com/platform/utils/FileOperateHelper.java b/src/com/platform/utils/FileOperateHelper.java index c07eba24..e3dc4830 100644 --- a/src/com/platform/utils/FileOperateHelper.java +++ b/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; @@ -49,23 +48,20 @@ public class FileOperateHelper { * @return */ @SuppressWarnings("resource") - public static String fileReader(String path) { + public static String fileReader(String path) { StringBuffer sb = new StringBuffer(); String tempString = ""; try { - File file = new File(path); + File file = new File(path); if (!file.exists()) - return ""; - FileReader f =new FileReader(path); - BufferedReader br =new BufferedReader(f); -// FileInputStream fis = new FileInputStream(file); -// BufferedReader br = new BufferedReader(new InputStreamReader(fis)); -// BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8")); + return "当前没有日志信息！"; + FileInputStream fis = new FileInputStream(file); + BufferedReader br = new BufferedReader(new InputStreamReader(fis,"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(); }