diff --git a/.classpath b/.classpath index 7155d58e..b39d1be2 100644 --- a/.classpath +++ b/.classpath @@ -4,15 +4,11 @@ - - - - - + diff --git a/WebContent/WEB-INF/config/config.properties b/WebContent/WEB-INF/config/config.properties index 56b7bdea..6f9d7280 100644 --- a/WebContent/WEB-INF/config/config.properties +++ b/WebContent/WEB-INF/config/config.properties @@ -4,7 +4,7 @@ # 驱动程序 jdbc.mysql.driver=com.mysql.jdbc.Driver # 连接url -jdbc.mysql.url=jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true +jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true # 用户名 jdbc.mysql.username=root # 密码 diff --git a/build/classes/.gitignore b/build/classes/.gitignore index 67f303f0..4bc3afa4 100644 --- a/build/classes/.gitignore +++ b/build/classes/.gitignore @@ -1,2 +1,2 @@ -/com/ -/dataSystem.properties +/com +/spring-applicationContext-test.xml diff --git a/build/classes/com/platform/controller/DataModelController.class b/build/classes/com/platform/controller/DataModelController.class index 6d59835f..837dcfde 100644 Binary files a/build/classes/com/platform/controller/DataModelController.class and b/build/classes/com/platform/controller/DataModelController.class differ diff --git a/build/classes/com/platform/controller/DefaultController.class b/build/classes/com/platform/controller/DefaultController.class index f975e29e..91940503 100644 Binary files a/build/classes/com/platform/controller/DefaultController.class and b/build/classes/com/platform/controller/DefaultController.class differ diff --git a/build/classes/com/platform/entities/EncodedInfoEntity.class b/build/classes/com/platform/entities/EncodedInfoEntity.class index f920dc4d..ca2439bd 100644 Binary files a/build/classes/com/platform/entities/EncodedInfoEntity.class and b/build/classes/com/platform/entities/EncodedInfoEntity.class differ diff --git a/build/classes/com/platform/utils/Configs.class b/build/classes/com/platform/utils/Configs.class index 6bc46bf3..ef6f24b0 100644 Binary files a/build/classes/com/platform/utils/Configs.class and b/build/classes/com/platform/utils/Configs.class differ diff --git a/src/com/base/BaseController.java b/src/com/base/BaseController.java index 8a6c02c2..2192dbc5 100644 --- a/src/com/base/BaseController.java +++ b/src/com/base/BaseController.java @@ -1,47 +1,54 @@ /** - * ļ BaseController.java - * Ȩ : XXƼ޹˾ - * : <> - * ޸ʱ䣺201697 - * ޸ݣ<޸> + * 文件名 ： BaseController.java + * 版权 : XX科技有限公司。 + * 描述 : <描述> + * 修改时间：2016年9月7日 + * 修改内容：<修改内容> */ package com.base; import javax.servlet.http.HttpServletRequest; +import org.apache.log4j.Logger; import org.springframework.web.bind.annotation.ExceptionHandler; +import com.platform.utils.Configs; + /** - * <һ仰ܼ> - * <ϸ> + * <一句话功能简述> + * <功能详细描述> * @author chen - * @version [汾ţ201697] - * @see [/] - * @since [Ʒ/ģ汾] + * @version [版本号，2016年9月7日] + * @see [相关类/方法] + * @since [产品/模块版本] */ -public class BaseController { +public class BaseController { + + /** log4j */ + public static Logger log = Logger.getRootLogger(); /** - * <һ仰ܼ> @ExceptionHandler쳣----ȫ쳣 - * <ϸ> + * <一句话功能简述> 基于@ExceptionHandler异常处理----全局异常处理 + * <功能详细描述> * @param request - * @param ex 쳣 + * @param ex 异常 * @return - * @see [ࡢ##Ա] + * @see [类、类#方法、类#成员] */ @ExceptionHandler - public String exp(HttpServletRequest request, Exception ex) { + public Object exp(HttpServletRequest request, Exception ex) { request.setAttribute("ex", ex); System.err.println("BaseController --exp "); - // ݲͬתͬҳ - if(ex instanceof CustomException) { - //TODO ·װjson - System.err.println("BaseController --exp -- CustomException "); - return "error-business"; + // 根据不同错误转向不同页面 + if(ex instanceof CustomException) { + CustomException cuse = (CustomException) ex; + log.error(Configs.GLOBAL_EXP_CUSTOM); + //TODO 从新封装json + return "{"+Configs.GLOBAL_EXP_CUSTOM+":"+cuse.getMsg()+"}"; } else { - //TODO ָҳ - + //TODO 其他错误则 调到指定页面 + log.error(Configs.GLOBAL_EXP_NOT_CUSTOM, ex); return "error"; } } diff --git a/src/com/base/Constant.java b/src/com/base/Constant.java index 87bd657d..4d336465 100644 --- a/src/com/base/Constant.java +++ b/src/com/base/Constant.java @@ -1,32 +1,22 @@ package com.base; -import java.io.File; - /** - * @ - * @author chen - * @date 2016830 - * @package com.base + * <一句话功能简述> + * <功能详细描述> + * @author chen + * @version [版本号，2016年9月8日] + * @see [相关类/方法] + * @since [产品/模块版本] */ public class Constant { - /** ļļ-dataSystem.properties */ - public static String SYSTEM_PROPERTIES_FIEL_PATH = "/com/base/dataSystem.properties"; - - /** ʻļļ-i18n.properties */ + /** 国际话配置文件文件-i18n.properties */ public static String I18N_PROPERTIES_FIEL_PATH = "/com/base/i18n.properties"; - /** ¼쳣ļ-system_exception.txt-λ-- */ - public final static String SYSTEM_EXCEPTION_FILEPATH = "\\log\\system_exception.txt"; - - - /** WritefileThread-߳˯ʱ--3000 */ + /** WritefileThread-线程睡眠时间--3000 */ public final static long THREAD_SLEEP_WRITEFILETHREAD = 3000; - /** Ƿ쳣дļ */ - public final static String IS_WRITE_LOGFILE = "iswritelogfile"; - - /** CustomException¼쳣ĶĶ--10 */ + /** CustomException记录报异常的对象的对象个数--10 */ public final static int CustomException_log_object_size = 10; diff --git a/src/com/base/Custom4exception.java b/src/com/base/Custom4exception.java index cfbab1e6..2aeba6c6 100644 --- a/src/com/base/Custom4exception.java +++ b/src/com/base/Custom4exception.java @@ -1,41 +1,20 @@ package com.base; - /** - * @ 쳣 - * @author chen - * @date 2016822 - * @package com.base + * <一句话功能简述> 异常常量编码 + * <功能详细描述> + * @author chen + * @version [版本号，2016年9月8日] + * @see [相关类/方法] + * @since [产品/模块版本] */ public class Custom4exception { - //3003001001 : һλʶ쳣 ڶλʶģ飬λʶ𣬵ڰ˵ʮλʶ쳣 - /** 3쳣 - * 003ģ - * 001Դ - * 001쳣 + //3003001001 : 第一位：标识异常， 第二到第四位：标识模块，第五道第七位：标识类别，第八道第十位标识具体异常 + /**eg + * 3：异常 + * 003：虚拟机模块 + * 001：软件依赖虚拟机资源类别 + * 001：启动异常 */ - /** -Դ-VM쳣 */ - public final static String vbox_start_exp = "3003001001"; - - /** -Դ-VBoxManage.exe 쳣 */ - public final static String vbox_exe_non_exist_exp = "3003001002"; - - /** --ùļж쳣 */ - public final static String share_dir_interrupted_exp = "3003002001"; - - /** ݹ-ϱ-жϻд쳣 */ - public final static String data_manage_interrupted_exp = "3004001001"; - - /** ģutils-xml-xmlǷ쳣 */ - public final static String xml_field_Illega_exp = "3005001001"; - - /** ģutils-xml-document쳣 */ - public final static String xml_docu_exp = "3005001002"; - - /** ģutils-xml-д쳣 */ - public final static String xml_io_exp = "3005001003"; - - /** ģutils-oracle-д쳣 */ - public final static String oracle_io_exp = "3005002001"; } diff --git a/src/com/base/CustomException.java b/src/com/base/CustomException.java index f9c4192c..1c1d43e9 100644 --- a/src/com/base/CustomException.java +++ b/src/com/base/CustomException.java @@ -1,35 +1,38 @@ package com.base; +import org.apache.log4j.Logger; +/** + * <一句话功能简述> + * <功能详细描述> + * @author chen + * @version [版本号，2016年9月8日] + * @see [相关类/方法] + * @since [产品/模块版本] + */ @SuppressWarnings("serial") public class CustomException extends Exception { - - /** Զ쳣Ϣ-Ϣ */ + + /** log4j */ + public static Logger log = Logger.getRootLogger(); + + /** 自定义异常信息-错误信息 */ private String msg; - /** */ + /** 操作对象 */ private Object[] objArray; - /** 쳣 */ + /** 异常 */ private Throwable cause; - static{ - // Ƿ ¼ 쳣߳ - if (Boolean.valueOf(Resource.getProperties().get(Constant.IS_WRITE_LOGFILE))) { - // ¼ 쳣߳ - WritefileThread wt = new WritefileThread(); - wt.start(); - } - } - public CustomException() { super(); } /** - * @ 쳣¼ļ - * @param code 쳣 - * @param msg Զ쳣Ϣ + * @功能 将异常记录进文件 + * @param code 异常编码 + * @param msg 自定义异常信息 * @param e * @param obj */ @@ -41,12 +44,12 @@ public class CustomException extends Exception { sbuf.append(code); sbuf.append("\r\n"); msg = Resource.getProperties().get(code); - // ¼Զ 쳣 + // 记录自定义的 异常 if (null != msg) { sbuf.append(msg); sbuf.append("\r\n"); } - // ¼ԭʼ쳣 + // 记录原始的异常 if (null != e) { StackTraceElement[] array = e.getStackTrace(); cause = e.getCause(); @@ -55,7 +58,7 @@ public class CustomException extends Exception { sbuf.append("\r\n"); } } - //¼ 쳣ʱ ǰĶ + //记录 出现异常时 当前的对象 if (null != obj) { Object[] array = obj; sbuf.append("Object[] size : "); @@ -80,14 +83,12 @@ public class CustomException extends Exception { } sbuf.append("\r\n"); - // Ƿ д ļ - if (Boolean.valueOf(Resource.getProperties().get(Constant.IS_WRITE_LOGFILE))) { - WritefileThread.getStrArray().add(sbuf.toString()); - } + // 是否 写入 文件 + log.error(sbuf.toString()); } /** - * @ msg + * @功能 获得msg * @return msg */ public String getMsg() { @@ -95,7 +96,7 @@ public class CustomException extends Exception { } /** - * @ objArray + * @功能 获得objArray * @return objArray */ public Object[] getObjArray() { @@ -103,7 +104,7 @@ public class CustomException extends Exception { } /** - * @ cause + * @功能 获得cause * @return cause */ public Throwable getCause() { diff --git a/src/com/base/FileOperate.java b/src/com/base/FileOperate.java deleted file mode 100644 index 718d3d4d..00000000 --- a/src/com/base/FileOperate.java +++ /dev/null @@ -1,383 +0,0 @@ -package com.base; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.RandomAccessFile; -import java.nio.channels.FileLock; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import javax.swing.filechooser.FileSystemView; - -/** - * @ ļ - * @author chen - * @date 201688 - * @package com.utils - */ -public class FileOperate { - private final static String localDiskName = "ش"; - private final static String enlocalDiskName = "Local Disk"; - private final static String CD = "CD"; - private final static String DVD = "DVD"; - public static String usbPath = ""; - - /** - * @ ȡȫⲿƶӲ· - * - * @return - */ - public static List filterDiskPath() { - FileSystemView fileSystemView = FileSystemView.getFileSystemView(); - List diskPathName = new ArrayList(); - File[] roots = File.listRoots(); - for (File file : roots) { - String diskName = fileSystemView.getSystemTypeDescription(file);// ȡ̵Ϣ - if (diskName.startsWith(localDiskName) || diskName.startsWith(enlocalDiskName) || diskName.contains(CD) - || diskName.contains(CD) || diskName.contains(DVD)) // Ϊƶʱ{ - continue; - diskPathName.add(file.getAbsolutePath()); - } - return diskPathName; - } - - /** - * @ ļ - * @param path - * ϼĿ¼ - * @param dirName - * Ŀ¼ - * @return - */ - public static int createDir(String path, String dirName) { - File dirFile = new File(path + "\\" + dirName); - if (!dirFile.exists()) { - if (!dirFile.mkdirs()) { - System.out.println("Ŀ¼ڣʧܣ"); - return 2; - } - return 1; - } - return 0; - } - - /** - * @ ļǷ - * - * @param path - * ļ· - * @return - */ - public static boolean isFileExists(String path) { - File file = new File(path); - if (file.exists()) - return true; - return false; - } - - /** - * @ ļǷ - * - * @param name - * ļ· - * @return - */ - public static boolean file_dir_exist(String name) { - - try { - File file = new File(name); - if (!file.exists()) { - return false; - // return true; - } - } - catch (Exception e) { - // TODO: handle exception - return false; - } - return true; - } - - /** - * @ 26ڵƴӵַʲôã - * @param length - * ƴӴ - * @return - */ - public static String getRandomString(int length) { // lengthʾַij - String base = "abcdefghijklmnopqrstuvwxyz"; - Random random = new Random(); - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < length; i++) { - int number = random.nextInt(base.length()); - sb.append(base.charAt(number)); - } - return sb.toString(); - } - - /** - * @ ַʽȡļ - * @param fiel_name - * ļ - * @return ַ - */ - public static String read_fileToStr(String fiel_name) { - String str = ""; - try { - File file = new File(fiel_name); - String lineTxt = ""; - InputStreamReader read = new InputStreamReader(new FileInputStream(file), "gbk");// ǵʽ - BufferedReader bufferedReader = new BufferedReader(read); - while ((lineTxt = bufferedReader.readLine()) != null) { - str = str + lineTxt; - } - bufferedReader.close(); - read.close(); - } - catch (Exception e) { - e.printStackTrace(); - return "Exception"; - } - return str; - } - - /** - * @ ȡļ·ĸĿ¼ʽ - * @param path_filename - * ļļ· - * @return - */ - public static String get_filename_from_path(String path_filename) { - String[] strings = path_filename.split("\\\\"); - - return strings[strings.length - 1]; - } - - /** - * @ dirPathĿ¼µļ - * @param dirPath - * Ŀ¼ - * @return ļ - */ - public static List findAllFilenameFromPath(String dirPath) { - ArrayList fileAbsolutePaths = new ArrayList<>(); - FileOperate.findFiles(dirPath, fileAbsolutePaths); - return fileAbsolutePaths; - } - - /** - * @ ɾĿ¼ļļ - * @param dirPath - * Ŀ¼ - * @return - */ - public static boolean delAllFileByDir(String dirPath) { - boolean flag = false; - File file = new File(dirPath); - // жĿ¼ļǷ - if (!file.exists()) { // ڷ false - return flag; - } - else { - // жǷΪļ - if (file.isFile()) { // Ϊļʱɾļ - return deleteFile(dirPath); - } - else { // ΪĿ¼ʱɾĿ¼ - return deleteDirectory(dirPath); - } - } - } - - /** - * @ дļ - * @param content - * ļ - * @param filePathName - * ļ· - */ - public static void writeFile(List content, String filePathName) { - if (null == content) { - return; - } - try { - FileWriter writer = new FileWriter(filePathName); - for (Object one : content) { - writer.write(one.toString()); - writer.write("\r\n"); - } - writer.close(); - } - catch (Exception e) { - // TODO: handle exception - // e.printStackTrace(); - } - } - - /** - * @ ׷ддļ - * @param content - * @param filePathName - */ - public static void appendWriteFile(String content, String filePathName){ - File file = new File(filePathName); - if (!file.exists() || !file.isFile()) { - ArrayList list = new ArrayList<>(); - list.add("ϵͳ쳣־\n"); - writeFile(list, filePathName); - } - try { - // һļдʽ - RandomAccessFile randomFile = new RandomAccessFile(filePathName, "rw"); - // ļȣֽ - long fileLength = randomFile.length(); - // дļָƵļβ - randomFile.seek(fileLength); -// randomFile.writeBytes(content); - // - randomFile.write(content.getBytes()); - randomFile.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - /** - * @ ļ - * @param fileName - * ļ· - */ - public static boolean islockFile(String fileName) { - Object result = null; - boolean isSuccess = true; - try { - result = tryLock(fileName); - if (null == result) { - isSuccess = false; - } - } - catch (IOException e) { - e.printStackTrace(); - isSuccess = false; - } - return isSuccess; - } - - /** - * @ ɾļ - * @param dirPath - * ļ· - * @return - */ - private static boolean deleteDirectory(String dirPath) { - // sPathļָβԶļָ - if (!dirPath.endsWith(File.separator)) { - dirPath = dirPath + File.separator; - } - File dirFile = new File(dirPath); - // dirӦļڣ߲һĿ¼˳ - if (!dirFile.exists() || !dirFile.isDirectory()) { - return false; - } - boolean flag = true; - // ɾļµļ(Ŀ¼) - File[] files = dirFile.listFiles(); - for (int i = 0; i < files.length; i++) { - // ɾļ - if (files[i].isFile()) { - flag = deleteFile(files[i].getAbsolutePath()); - if (!flag) - break; - } // ɾĿ¼ - else { - flag = deleteDirectory(files[i].getAbsolutePath()); - if (!flag) - break; - } - } - if (!flag) - return false; - // ɾǰĿ¼ - if (dirFile.delete()) { - return true; - } - else { - return false; - } - } - - /** - * @ ɾļ - * @param filePath - * ļ· - * @return - */ - private static boolean deleteFile(String filePath) { - boolean flag = false; - File file = new File(filePath); - // ·ΪļҲΪɾ - if (file.isFile() && file.exists()) { - file.delete(); - flag = true; - } - return flag; - } - - /** - * @ dirPathĿ¼µļ - * @param dirPath - * Ŀ¼ - * @param fileAbsolutePaths - * ļ - * @return ļ - */ - private static List findFiles(String dirPath, List fileAbsolutePaths) { - File file = new File(dirPath); - // ļʱ - if (!file.isDirectory()) { - String path = file.getAbsolutePath(); - fileAbsolutePaths.add(path); - } - // ļʱ - else if (file.isDirectory()) { - String[] filelist = file.list(); - if (null != filelist) { - int fileNum = filelist.length; - for (int i = 0; i < fileNum; i++) { - String tempPath = dirPath + "\\" + filelist[i]; - findFiles(tempPath, fileAbsolutePaths); - } - } - - } - return fileAbsolutePaths; - } - - /** - * @ ļ - * @param fileName ļ· - * @return - * @throws IOException - */ - @SuppressWarnings("resource") - private static FileLock tryLock(String fileName) throws IOException { - File lockF = new File(fileName); // Ҫļ - lockF.deleteOnExit(); // ָ˳ʱͷ - RandomAccessFile file = new RandomAccessFile(lockF, "rws"); // ָҪļ - FileLock res = null; - try { - res = file.getChannel().tryLock(); // ͼȡļ - } - catch (Exception e) { // ļ߳ʱ׳쳣 - file.close(); - return null; - } - return res; - } - -} diff --git a/src/com/base/Resource.java b/src/com/base/Resource.java index deafbdae..0b900bfe 100644 --- a/src/com/base/Resource.java +++ b/src/com/base/Resource.java @@ -17,25 +17,25 @@ public class Resource { private static Map properties = new HashMap<>(); static{ - // ȡ propertiesļ + // 读取 properties文件 // readPropertiesFile(Constant.SYSTEM_PROPERTIES_FIEL_PATH); readPropertiesFile4Chinese(Constant.I18N_PROPERTIES_FIEL_PATH); } /** - * @ ȡã룩 - * @param filename "/com/utils/exception/i18n.properties" ĸʽ + * @功能 读取配置（解决中文乱码） + * @param filename "/com/utils/exception/i18n.properties" 的格式 */ public static void readPropertiesFile4Chinese(String filename) { Properties pro = new Properties(); try { - // ȡļ XXXX.propertiesReaderwriter룩 + // 读取属性文件 XXXX.properties（Reader。writer解决中文乱码） // InputStreamReader in= new InputStreamReader(Resource.class.getClassLoader().getResourceAsStream(filename), "UTF-8"); InputStreamReader in= new InputStreamReader(Resource.class.getResourceAsStream(filename), "UTF-8"); BufferedReader bf = new BufferedReader(in); // InputStreamReader in = new BufferedInputStream(new FileInputStream(filename)); - pro.load(bf); // /б + pro.load(bf); // /加载属性列表 Iterator it = pro.stringPropertyNames().iterator(); while (it.hasNext()) { String key = it.next(); @@ -48,7 +48,7 @@ public class Resource { } /** - * @ properties + * @功能 获得properties * @return properties */ public static Map getProperties() { @@ -56,15 +56,15 @@ public class Resource { } /** - * @ ȡ - * @param filename ļ· + * @功能 读取配置 + * @param filename 文件绝对路径 */ public static void readPropertiesFile(String filename) { Properties pro = new Properties(); try { - // ȡļ XXXX.properties Ļ 룩 + // 读取属性文件 XXXX.properties（ 中文会 乱码） BufferedInputStream bf = new BufferedInputStream(new FileInputStream(filename)); - pro.load(bf); // /б + pro.load(bf); // /加载属性列表 Iterator it = pro.stringPropertyNames().iterator(); while (it.hasNext()) { String key = it.next(); diff --git a/src/com/base/WritefileThread.java b/src/com/base/WritefileThread.java deleted file mode 100644 index 2bd55d90..00000000 --- a/src/com/base/WritefileThread.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.base; - -import java.util.ArrayList; -import java.util.List; - -import com.base.Constant; - -/** - * @ д쳣--ļsystem_exception.txt - * @author chen - * @date 2016830 - * @package com.utils.exception - */ -public class WritefileThread extends Thread implements Runnable{ - - /** 洢쳣Ϣ */ - private static List strArray = new ArrayList<>(); - - /** Ƿ */ - private static boolean isContinue = true; - - @Override - public void run() { - super.run(); - while(isContinue){ - try { - Thread.sleep(Constant.THREAD_SLEEP_WRITEFILETHREAD); - } catch (InterruptedException e) { - e.printStackTrace(); - } - synchronized (strArray) { - //ͬ--д־ - String str = array2Str(strArray); -//TODO FileOperate.appendWriteFile(str, Constant.SYSTEM_EXCEPTION_FILEPATH); - strArray.clear(); - } - } - } - /** - * @ strArray - * @return strArray - */ - public static List getStrArray() { - return strArray; - } - - /** - * @ isContinue - * @param isContinue - */ - public static void setContinue(boolean isContinue) { - WritefileThread.isContinue = isContinue; - } - - /** - * @ list --> String - * @param array arrayList - * @return String - */ - @SuppressWarnings("rawtypes") - private static String array2Str(List array) { - StringBuffer sbuf = new StringBuffer(); - for (Object object : array) { - sbuf.append(object); - } - return sbuf.toString(); - } -} diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java index f555497e..ba2295ca 100644 --- a/src/com/platform/controller/DataModelController.java +++ b/src/com/platform/controller/DataModelController.java @@ -14,7 +14,6 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.base.BaseController; import com.platform.entities.PagerOptions; import com.platform.service.DataInfoService; import com.platform.service.OracleStatusService; @@ -22,7 +21,7 @@ import com.platform.utils.Configs; import com.platform.utils.UtilsHelper; @Controller -public class DataModelController extends BaseController{ +public class DataModelController { @Resource(name = "dataInfoService") private DataInfoService dfs; @@ -37,7 +36,7 @@ public class DataModelController extends BaseController{ Map paramMap = res.getParameterMap(); Set keySet = paramMap.keySet(); Map params = new HashMap(); - StringBuffer sb = new StringBuffer().append("ǰ:{"); + StringBuffer sb = new StringBuffer().append("当前的请求参数:{"); for (String str : keySet) { String value = paramMap.get(str)[0]; if (StringUtils.isNotEmpty(value)){ @@ -68,7 +67,7 @@ public class DataModelController extends BaseController{ String[] oraclesName = paramMap.get("oracleName"); if (oraclesName != null) for (String rcName : oraclesName) { - Configs.CONSOLE_LOGGER.info("ִк̨ݿ\t" + rcName); + Configs.CONSOLE_LOGGER.info("执行后台数据库连接\t" + rcName); new OracleStatusService().connectToOracle(rcName); } } @@ -81,7 +80,7 @@ public class DataModelController extends BaseController{ String operate = paramMap.get("operation")[0]; if (null != oraclesName) { for (String rcName : oraclesName) { - Configs.CONSOLE_LOGGER.info("ȡ̨ݿ:\t" + rcName); + Configs.CONSOLE_LOGGER.info("取消后台数据库连接:\t" + rcName); new OracleStatusService().cancelToOracle(rcName, operate); } } diff --git a/src/com/platform/controller/DefaultController.java b/src/com/platform/controller/DefaultController.java index 84eca9fa..21ad553f 100644 --- a/src/com/platform/controller/DefaultController.java +++ b/src/com/platform/controller/DefaultController.java @@ -7,31 +7,22 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import com.base.BaseController; -import com.base.CustomException; -import com.base.Resource; import com.platform.utils.Configs; @Controller -public class DefaultController extends BaseController{ +public class DefaultController { @RequestMapping("/") public ModelAndView defaultHandler(HttpServletRequest req, HttpServletResponse res){ - //ƥ + //处理不匹配的请求 System.out.println("index"); return new ModelAndView("index"); } @RequestMapping("/test") - public void test(HttpServletRequest req, HttpServletResponse res) throws CustomException{ + public void test(HttpServletRequest req, HttpServletResponse res){ //System.out.println(Class.class.getClass().getResource("/").getPath()); - new Resource(); System.out.println(Configs.EXTRACT_LOG_LOCALTION); - boolean istrue = true; - if (istrue) { - throw new CustomException("3212", null); - } - System.out.println("end"); } } diff --git a/src/com/platform/controller/FolderController.java b/src/com/platform/controller/FolderController.java new file mode 100644 index 00000000..5550b262 --- /dev/null +++ b/src/com/platform/controller/FolderController.java @@ -0,0 +1,35 @@ + +/** + * ļ : FolderController.java + * Ȩ : <Ȩ/˾> + * : <> + * @author chen + * 汾 : <汾> + * ޸ʱ䣺 201698 + * ޸ݣ <޸> + */ +package com.platform.controller; + +import com.base.BaseController; + +/** + * <һ仰ܼ> + * <ϸ> + * @author chen + * @version [汾ţ201698] + * @see [/] + * @since [Ʒ/ģ汾] + */ + +public class FolderController extends BaseController { + + /** + * <һ仰ܼ> + * <ϸ> + * @see [ࡢ##Ա] + */ + public FolderController() { + // TODO Auto-generated constructor stub + } + +} diff --git a/src/com/platform/dao/EncodeInfoDao.java b/src/com/platform/dao/EncodeInfoDao.java index 69bfd819..a877f5f3 100644 --- a/src/com/platform/dao/EncodeInfoDao.java +++ b/src/com/platform/dao/EncodeInfoDao.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; import com.platform.entities.EncodedInfoEntity; /** - * ݿ: ʵɾġ + * 数据库操作: 实现增、删、改、查 * * @author wuming * @@ -21,49 +21,49 @@ import com.platform.entities.EncodedInfoEntity; public interface EncodeInfoDao { /** - * ȡѯµʵ壨/ϵͳϢ + * 获取查询表下的所有实体（行政区划/系统）信息 * * @param tableName - * ѯı - * @return ʵϢ:ƺͱ + * 查询的表名 + * @return 所有实体信息:名称和编码 */ @Select("SELECT code, name FROM ${tableName}") public List getAllEntityInfo( @Param("tableName") String tableName); /** - * ʵ壨/ϵͳƲѯ + * 根据实体（行政区划/系统）的名称查询编码 * * @param code - * ʵ + * 实体编码 * @param tableName - * ѯı - * @return ѯֻһ¼ + * 查询的表名 + * @return 编码是主键，查询结果最多只有一条记录 */ @Select("SELECT name FROM ${tableName} WHERE code = #{code}") public String getEncodeNameByCode(@Param("code") String code, @Param("tableName") String tableName); /** - * ʵ壨/ϵͳıѯ + * 根据实体（行政区划/系统）的编码查询名称 * * @param name - * ʵ + * 实体名称 * @param tableName - * ѯı - * @return Ʋѯܻж + * 查询的表名 + * @return 名称不是主键，查询结果可能会有多个 */ @Select("SELECT code FROM ${tableName} WHERE name = #{name}") public List getEncodeCodeByName(@Param("name") String name, @Param("tableName") String tableName); /** - * ʵ壨/ϵͳı룬ʵ + * 根据实体（行政区划/系统）的编码，更新实体的名称 * * @param code - * ϵͳ + * 系统编码 * @param tableName - * ѯı + * 查询的表名 * @return */ @Update("UPDATE ${tableName} SET name = #{name} WHERE code = #{code}") @@ -71,12 +71,12 @@ public interface EncodeInfoDao { @Param("name") String name, @Param("tableName") String tableName); /** - * вʵ壨/ϵͳϢ + * 向表中插入实体（行政区划/系统）信息 * * @param efe - * ʵϢ + * 插入的实体信息 * @param tableName - * + * 表名 * @return */ @Insert("INSERT INTO ${tableName} (code, name) VALUES (#{efe.code}, #{efe.name})") @@ -84,12 +84,12 @@ public interface EncodeInfoDao { @Param("tableName") String tableName); /** - * ɾеʵ壨/ϵͳ + * 删除表中的实体（行政区划/系统） * * @param code - * ʵı + * 实体的编码 * @param tableName - * + * 表名 * @return */ @Delete("DELETE FROM ${tableName} WHERE code = #{code}") diff --git a/src/com/platform/entities/DataInfoEntity.java b/src/com/platform/entities/DataInfoEntity.java index d3581c89..3db92f4a 100644 --- a/src/com/platform/entities/DataInfoEntity.java +++ b/src/com/platform/entities/DataInfoEntity.java @@ -1,27 +1,27 @@ package com.platform.entities; /** - * Ϣʵ + * 数据信息实体类 * * @author wuming * */ public class DataInfoEntity { private int id; - private String regionalismCode; // - private String cityName; // - private String districtName; // - private int systemCode; // ϵͳ - private String systemName; // ϵͳ - private String dataType; // ͣ\籣\... - private int dataVersion; // ݰ汾 - private String submittedBatch; // ϱ - private String dataPath; // · - private String collectingTime; // ɼʱ - private String collectorContacts; // ɼ˵ϵ - private String charset; // ݵַ - private String collectorName; // ɼ - private String year; // + private String regionalismCode; // 行政区划编码 + private String cityName; // 市 + private String districtName; // 区县 + private int systemCode; // 系统编码 + private String systemName; // 系统名称 + private String dataType; // 数据类型：财政\社保\... + private int dataVersion; // 数据版本 + private String submittedBatch; // 上报批次 + private String dataPath; // 数据路径 + private String collectingTime; // 采集时间 + private String collectorContacts; // 采集人的联系 + private String charset; // 数据的字符编码 + private String collectorName; // 采集人姓名 + private String year; // 数据年度 public DataInfoEntity() { } diff --git a/src/com/platform/entities/EncodedInfoEntity.java b/src/com/platform/entities/EncodedInfoEntity.java index 27055b10..3f2f425e 100644 --- a/src/com/platform/entities/EncodedInfoEntity.java +++ b/src/com/platform/entities/EncodedInfoEntity.java @@ -2,16 +2,14 @@ package com.platform.entities; /** * - * Ϣʵ - * /ϵͳϢ + * 编码信息实体 + * 行政区划/系统信息 * @author wuming * */ public class EncodedInfoEntity { - /** */ - private String name; - /** */ - private String code; + private String name; //名称 + private String code; //编码 public EncodedInfoEntity() {} diff --git a/src/com/platform/entities/PagerOptions.java b/src/com/platform/entities/PagerOptions.java index 046a90cd..f347488f 100644 --- a/src/com/platform/entities/PagerOptions.java +++ b/src/com/platform/entities/PagerOptions.java @@ -1,29 +1,29 @@ package com.platform.entities; public class PagerOptions { - private Integer currentPageNum; //ǰҳ + private Integer currentPageNum; //当前页码 - private String dataType; // + private String dataType; //数据类型 - private String submittedBatch; // + private String submittedBatch; //数据批次 - private String cityName; // + private String cityName; //城市名称 - private String districtName; // + private String districtName; //区县名 - private Integer dataVersion; //ݰ汾 + private Integer dataVersion; //数据版本 - private String systemName; //ϵͳ + private String systemName; //系统名称 - private String dataYear; // + private String dataYear; // 数据年度 - private Integer limit; //һβѯؼ¼ + private Integer limit; //一次查询返回记录条数 - private Integer offset; // ѯƫʼid + private Integer offset; // 查询偏移量：起始id - private Integer totalLimit; //ǰҳǰж + private Integer totalLimit; //当前页前面已有多少条数据 - private Integer priorTableSize; //ǰһβһҳʾ + private Integer priorTableSize; //前一次操作一页显示的数据条数 public Integer getCurrentPageNum() { return currentPageNum; diff --git a/src/com/platform/oracle/OracleConnector.java b/src/com/platform/oracle/OracleConnector.java index 28d24135..90f29a7d 100644 --- a/src/com/platform/oracle/OracleConnector.java +++ b/src/com/platform/oracle/OracleConnector.java @@ -14,7 +14,7 @@ public class OracleConnector { static { try { Class.forName("oracle.jdbc.driver.OracleDriver"); - Configs.CONSOLE_LOGGER.info("Oracleسɹ"); + Configs.CONSOLE_LOGGER.info("Oracle驱动加载成功"); } catch (ClassNotFoundException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -59,10 +59,10 @@ public class OracleConnector { } /** - * ִжoracleݿɾ + * 执行对oracle数据库的增、删 * @param conn * @param sql - * @return Ƿִгɹ + * @return 是否执行成功 */ public boolean execOracleSQL(Connection conn, String sql) { boolean flag = false; diff --git a/src/com/platform/service/DataInfoServiceImp.java b/src/com/platform/service/DataInfoServiceImp.java index 3c89b60e..124e0aca 100644 --- a/src/com/platform/service/DataInfoServiceImp.java +++ b/src/com/platform/service/DataInfoServiceImp.java @@ -24,12 +24,12 @@ public class DataInfoServiceImp implements DataInfoService { public ModelMap getPagerTableData(PagerOptions pagerOptions) { // TODO Auto-generated method stub ModelMap modelMap = new ModelMap(); - int count = dfdDao.getLimitedDataCount(pagerOptions); //ȡܼ¼ + int count = dfdDao.getLimitedDataCount(pagerOptions); //获取总记录条数 int offset = 0; if (pagerOptions.getCurrentPageNum() > 1) { pagerOptions.setTotalLimit((pagerOptions.getCurrentPageNum() - 1) * pagerOptions.getPriorTableSize()); - offset = dfdDao.getLimitedBeginId(pagerOptions); //ȡʼѯid + offset = dfdDao.getLimitedBeginId(pagerOptions); //获取起始查询id System.out.println(offset); } pagerOptions.setOffset(offset + 1); @@ -46,11 +46,11 @@ public class DataInfoServiceImp implements DataInfoService { for(String idx: id){ List paths = dfdDao.getIdIsExist(Integer.parseInt(idx)); if(paths.size()>0){ - //ɾļ + //删除文件操作 for (int i = 0; i < paths.size(); i++) { System.out.println(paths.get(i)); } - //ɾݿ¼ + //删除数据库记录 //dfdDao.deleteRow(idx); } } diff --git a/src/com/platform/service/EncodeInfoService.java b/src/com/platform/service/EncodeInfoService.java index 8ef13844..36a200bc 100644 --- a/src/com/platform/service/EncodeInfoService.java +++ b/src/com/platform/service/EncodeInfoService.java @@ -5,7 +5,7 @@ import java.util.List; import com.platform.entities.EncodedInfoEntity; /** - * ݿҵ߼ӿ + * 数据库业务逻辑处理接口 * * @author wuming * diff --git a/src/com/platform/service/EncodeInfoServiceImpl.java b/src/com/platform/service/EncodeInfoServiceImpl.java index 3e5fe735..8492485d 100644 --- a/src/com/platform/service/EncodeInfoServiceImpl.java +++ b/src/com/platform/service/EncodeInfoServiceImpl.java @@ -10,7 +10,7 @@ import com.platform.dao.EncodeInfoDao; import com.platform.entities.EncodedInfoEntity; /** - * ҵ߼ľʵ + * 业务逻辑的具体实现类 * * @author wuming * @@ -26,7 +26,7 @@ public class EncodeInfoServiceImpl implements EncodeInfoService { } /** - * ݴݵtableNameȡӦʵϢ/ϵͳ + * 根据传递的tableName参数获取对应实体信息（行政区划/系统） */ @Override public List getAllEncodeInfo(String tableName) { @@ -35,7 +35,7 @@ public class EncodeInfoServiceImpl implements EncodeInfoService { } /** - * + * 测试事物 */ @Override public int deleteEncodeByCode(String code, String tableName) { diff --git a/src/com/platform/service/OracleExtractHelper.java b/src/com/platform/service/OracleExtractHelper.java index dd8eb368..73043995 100644 --- a/src/com/platform/service/OracleExtractHelper.java +++ b/src/com/platform/service/OracleExtractHelper.java @@ -14,11 +14,11 @@ public class OracleExtractHelper { private OracleConnector oConnector; /** - * жdblinkǷѾ + * 判断dblink是否已经存在 * * @param conn * @param linkName - * dblink + * dblink的名称 * @return */ private boolean hasSameNameDBLink(Connection conn, String linkName) { @@ -37,11 +37,11 @@ public class OracleExtractHelper { } /** - * dblink + * 创建dblink * * @param conn * @param oc - * dblinkӲʵ + * dblink连接参数实体 */ public void createDBLink(Connection conn, OracleConnectorParams oc) { String linkName = "LinkTo" + oc.getName(); @@ -55,7 +55,7 @@ public class OracleExtractHelper { + ")))(CONNECT_DATA =(SERVICE_NAME =" + oc.getDatabase() + ")))';"; if (null != oc) { - if (hasSameNameDBLink(conn, linkName)) { // dblinkѾ,ɾdblinkڴdblink + if (hasSameNameDBLink(conn, linkName)) { // 如果dblink已经存在,先删除dblink，在创建dblink String deleteSql = "DROP PUBLIC DATABASE LINK LinkTo" + linkName; FileOperateHelper @@ -67,13 +67,13 @@ public class OracleExtractHelper { + oc.getName(), sql); oConnector.execOracleSQL(conn, sql); } else { - Configs.CONSOLE_LOGGER.error("ɾеDBLinkʧ,޷µDBLink!"); + Configs.CONSOLE_LOGGER.error("删除已有的DBLink失败,无法创建新的DBLink!"); FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION - + oc.getName(), "ɾеDBLinkʧ,޷µDBLink!"); + + oc.getName(), "删除已有的DBLink失败,无法创建新的DBLink!"); } } else { - // 򣬴dblink + // 否则，创建dblink oConnector.execOracleSQL(conn, sql); FileOperateHelper.fileWrite( Configs.EXTRACT_LOG_LOCALTION + oc.getName(), sql); @@ -82,7 +82,7 @@ public class OracleExtractHelper { } /** - * ռ + * 创建表空间 * * @param conn * @param oc @@ -103,7 +103,7 @@ public class OracleExtractHelper { } /** - * ûȨ + * 创建用户并授权 * * @param conn * @param oc @@ -119,7 +119,7 @@ public class OracleExtractHelper { } /** - * ִлܲ + * 执行汇总操作 * * @param conn * @param oc diff --git a/src/com/platform/service/OracleStatusService.java b/src/com/platform/service/OracleStatusService.java index 158eaf3f..0b081a88 100644 --- a/src/com/platform/service/OracleStatusService.java +++ b/src/com/platform/service/OracleStatusService.java @@ -17,9 +17,9 @@ import com.platform.utils.Configs; public class OracleStatusService { private static Map alliveTask = new Hashtable(); - public final static int EXEC_TIME = 10;// Ӷٴκ󲻳ɹȡ - public final static long INTERVAL_TIME = 60 * 1000;// ÿٺִһ - public final static long DELAY_TIME = 0; // ӳٶִ + public final static int EXEC_TIME = 10;// 连接多少次后不成功，取消链接 + public final static long INTERVAL_TIME = 60 * 1000;// 每隔多少毫秒执行一次连接任务 + public final static long DELAY_TIME = 0; // 延迟多少秒后执行 public void connectToOracle(String replicasName) { SimpleKubeClient sKubeClient = new SimpleKubeClient(); @@ -55,7 +55,7 @@ public class OracleStatusService { } /** - * ȡƳָʱ + * 取消并移除指定定时任务 * * * @param taskName @@ -73,7 +73,7 @@ public class OracleStatusService { } /** - * նʱ + * 清空定时任务 */ public void cleanUpAlliveTask() { Iterator> iterator = alliveTask.entrySet() @@ -86,7 +86,7 @@ public class OracleStatusService { } /** - * oracle + * 链接oracle任务类 * * @author wuming * @@ -114,14 +114,14 @@ public class OracleStatusService { + ocp.getPort() + ":" + ocp.getDatabase(); boolean flag = OracleConnector.canConnect(url, ocp.getUser(), ocp.getPassword()); - String message = "ʧ"; + String message = "失败"; if (flag && alliveTask.containsKey(taskName)) { client.updateOrAddReplicasLabelById(taskName, "status", "2"); - message = "ɹ"; - killAlliveTask(taskName); // ӳɹȡ + message = "成功"; + killAlliveTask(taskName); // 连接成功，取消连接 } - Configs.CONSOLE_LOGGER.info("ӵݿ " + taskName - + "\t[ӽ " + message + "]"); + Configs.CONSOLE_LOGGER.info("连接到数据库服务： " + taskName + + "\t[连接结果： " + message + "]"); } count++; } diff --git a/src/com/platform/utils/ConfigLoder.java b/src/com/platform/utils/ConfigLoder.java index fe3ef0f9..ce3b30a0 100644 --- a/src/com/platform/utils/ConfigLoder.java +++ b/src/com/platform/utils/ConfigLoder.java @@ -29,7 +29,7 @@ public class ConfigLoder { } /** - * ȡPropertyеֵ + * 读取文Property中的属性值 * * @param key * @return diff --git a/src/com/platform/utils/ConfigPropertyReader.java b/src/com/platform/utils/ConfigPropertyReader.java index 7f9df866..d2a3bd9b 100644 --- a/src/com/platform/utils/ConfigPropertyReader.java +++ b/src/com/platform/utils/ConfigPropertyReader.java @@ -29,7 +29,7 @@ public class ConfigPropertyReader { } /** - * ȡPropertyеֵ + * 读取文Property中的属性值 * * @param key * @return diff --git a/src/com/platform/utils/Configs.java b/src/com/platform/utils/Configs.java index 87ee6c2e..bb2afede 100644 --- a/src/com/platform/utils/Configs.java +++ b/src/com/platform/utils/Configs.java @@ -3,6 +3,13 @@ package com.platform.utils; import org.apache.log4j.Logger; public class Configs { + + /** 全局自定义异常--编码 */ + public static final String GLOBAL_EXP_CUSTOM = "3001001001"; + + /** 全局非自定义异常--编码 */ + public static final String GLOBAL_EXP_NOT_CUSTOM = "3001001002"; + public static final String CONFIG_LOCALTION = "WebContent/WEB-INF/config/config.properties"; public static final Logger CONSOLE_LOGGER = Logger.getLogger("console"); @@ -14,32 +21,32 @@ public class Configs { public static final Logger LOGGER = Logger.getLogger(Configs.class); - public static String KUBE_MASTER_URL = "http://192.168.0.113:8080/"; // kubernetesȺmaser + public static String KUBE_MASTER_URL = "http://192.168.0.113:8080/"; // kubernetes集群的maser // URl - public static int ORACLE_DEFAULT_PORT = 1521; // oracleĬ϶˿ں + public static int ORACLE_DEFAULT_PORT = 1521; // oracle的默认端口号 - public static String COLLECT_USER_NAME = "system"; //ɼͳһĵû + public static String COLLECT_USER_NAME = "system"; //采集统一的登入用户名 - public static String COLLECT_PASSWORD = "oracle"; //ɼͳһĵ + public static String COLLECT_PASSWORD = "oracle"; //采集统一的登入密码 - public static String COLLECT_SERVICE_NAME = "orcl"; //ɼͳһķ + public static String COLLECT_SERVICE_NAME = "orcl"; //采集库统一的服务名 - public static String GATHER_PORT ="1521"; //ܿĶ˿ں + public static String GATHER_PORT ="1521"; //汇总库的端口号 - public static String GATHER_USER_NAME = "system"; //ܿĵû + public static String GATHER_USER_NAME = "system"; //汇总库的登入用户名 - public static String GATHER_USER_PASSWORD = "1"; //ܿĵ + public static String GATHER_USER_PASSWORD = "1"; //汇总库的登入密码 - public static String GATHER_SERVICE_NAME = "orcl"; //ܿķ + public static String GATHER_SERVICE_NAME = "orcl"; //汇总库的服务名 - public static String TABLE_SUFFIX = "_20152016"; //ܱܿĺ׺ + public static String TABLE_SUFFIX = "_20152016"; //汇总库汇总表的后缀名 - public static String EXTRACT_LOG_LOCALTION = "/home/log"; //ݻ־λ + public static String EXTRACT_LOG_LOCALTION = "/home/log"; //数据汇总日志保存位置 - public static String GATHER_TABLESPACE_NAME=""; //ռ + public static String GATHER_TABLESPACE_NAME=""; //表空间名 - public static String GATHER_TABLESPACE_PATH=""; //ռ· + public static String GATHER_TABLESPACE_PATH=""; //表空间路径 - public static String GATHER_TABLE_PASSWORD=""; // + public static String GATHER_TABLE_PASSWORD=""; //登入密码 } diff --git a/src/com/platform/utils/ConfigsLoader.java b/src/com/platform/utils/ConfigsLoader.java index 1b1c1959..44f00e7f 100644 --- a/src/com/platform/utils/ConfigsLoader.java +++ b/src/com/platform/utils/ConfigsLoader.java @@ -11,14 +11,14 @@ public class ConfigsLoader implements ServletContextListener { @Override public void contextDestroyed(ServletContextEvent sEvent) { // TODO Auto-generated method stub - Configs.CONSOLE_LOGGER.info("ϵͳֹͣ.."); + Configs.CONSOLE_LOGGER.info("系统停止.."); } @SuppressWarnings("static-access") @Override public void contextInitialized(ServletContextEvent sEvent) { // TODO Auto-generated method stub - Configs.CONSOLE_LOGGER.info("ϵͳʼ.."); + Configs.CONSOLE_LOGGER.info("系统初始化.."); String contextPath = sEvent.getServletContext().getRealPath("/") + "WEB-INF/config/config.properties"; this.cReader = ConfigPropertyReader.Builder(contextPath); diff --git a/src/com/platform/utils/FileOperateHelper.java b/src/com/platform/utils/FileOperateHelper.java index 31827547..b2b9fa9b 100644 --- a/src/com/platform/utils/FileOperateHelper.java +++ b/src/com/platform/utils/FileOperateHelper.java @@ -8,7 +8,7 @@ import java.io.IOException; import java.io.InputStreamReader; /** - * ļд + * 文件读写操作帮助类 * * @author wuming * @@ -16,7 +16,7 @@ import java.io.InputStreamReader; public class FileOperateHelper { /** - * ׷ӵķʽϢдļ + * 以追加的方式将信息写入文件 * * @param path * @param message @@ -27,7 +27,7 @@ public class FileOperateHelper { File file = new File(path); if (file.exists()) file.createNewFile(); - FileOutputStream out = new FileOutputStream(file, true); // ׷ӷʽtrue + FileOutputStream out = new FileOutputStream(file, true); // 如果追加方式用true StringBuffer sb = new StringBuffer(); sb.append(message).append("\n"); out.write(sb.toString().getBytes("utf-8")); @@ -37,7 +37,7 @@ public class FileOperateHelper { } /** - * ļȡ + * 文件读取方法 * @param path * @return */ diff --git a/src/com/platform/utils/UtilsHelper.java b/src/com/platform/utils/UtilsHelper.java index 348f7a54..3da84c22 100644 --- a/src/com/platform/utils/UtilsHelper.java +++ b/src/com/platform/utils/UtilsHelper.java @@ -23,7 +23,7 @@ public class UtilsHelper { for (Field fs : fileds) { String fieldName = fs.getName(); String fieldType = fs.getGenericType().toString() - .replace("class ", ""); // typeͣǰ"class " + .replace("class ", ""); // 如果type是类类型，则前面包含"class "，后面跟类名 if (paramMap.containsKey(fieldName)) { Method method = clazz.getDeclaredMethod( getAttributeSetName(fs), Class.forName(fieldType)); @@ -72,11 +72,11 @@ public class UtilsHelper { } /** - * {@fs}set + * 生成属性{@fs}的set方法的名字 * * @param fs - * Զ - * @return set + * 属性对象 + * @return set方法的名字 */ private static String getAttributeSetName(Field fs) { String fieldName = fs.getName(); diff --git a/test/com/platform/test/TestController.java b/test/com/platform/test/TestController.java index 662ee505..94e8aaf0 100644 --- a/test/com/platform/test/TestController.java +++ b/test/com/platform/test/TestController.java @@ -35,8 +35,8 @@ public class TestController { @ResponseBody public List getJson(HttpServletRequest res, HttpServletResponse req) { List list = new ArrayList(); - list.add(new User("lisi", 1, "")); - list.add(new User("zhansan", 2, "")); + list.add(new User("lisi", 1, "男")); + list.add(new User("zhansan", 2, "男")); return list; } diff --git a/test/com/platform/test/TestEncodeInfoDao.java b/test/com/platform/test/TestEncodeInfoDao.java index 8e729bf5..3ad7d492 100644 --- a/test/com/platform/test/TestEncodeInfoDao.java +++ b/test/com/platform/test/TestEncodeInfoDao.java @@ -32,26 +32,26 @@ public class TestEncodeInfoDao extends SMBasedTest { @Test public void testGetEncodeNameByCode() { String result = eiDao.getEncodeNameByCode("1", testTableName); - Assert.assertTrue(result.equals("Ԥִϵͳ")); + Assert.assertTrue(result.equals("预算执行系统")); } @Test public void testGetEncodeCodeByName() { List result = eiDao - .getEncodeCodeByName("Ԥִϵͳ", testTableName); + .getEncodeCodeByName("预算执行系统", testTableName); Assert.assertTrue(result.size() > 0); } @Test public void testUpdateEncodeNameByCode() { int result = eiDao - .updateEncodeNameByCode("3", "һ廯ƽ̨", testTableName); + .updateEncodeNameByCode("3", "财政一体化平台", testTableName); Assert.assertTrue(result > 0); } @Test public void testInsertEncodeEntity() { - int result = eiDao.insertEncodeEntity(new EncodedInfoEntity("˰ϵͳ", + int result = eiDao.insertEncodeEntity(new EncodedInfoEntity("非税收入系统", "4"), testTableName); Assert.assertTrue(result == 1); } diff --git a/test/com/platform/test/TestEncodeService.java b/test/com/platform/test/TestEncodeService.java index 3b4f40c6..a790ebe4 100644 --- a/test/com/platform/test/TestEncodeService.java +++ b/test/com/platform/test/TestEncodeService.java @@ -24,11 +24,11 @@ public class TestEncodeService extends SMBasedTest { @Test public void testGetEncodeNameByCode() { String result = eis.getEncodeNameByCode("2", testTableName); - Assert.assertTrue(result.equals("Ԥ")); + Assert.assertTrue(result.equals("部门预算")); } /** - * + * 事务测试 */ @Test public void testDeleteEncodeByCode() { diff --git a/test/com/test/base/ResourceTest.java b/test/com/test/base/ResourceTest.java deleted file mode 100644 index 6bc65160..00000000 --- a/test/com/test/base/ResourceTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * ļ ResourceTest.java - * Ȩ : XXƼ޹˾ - * : <> - * ޸ʱ䣺201697 - * ޸ݣ<޸> - */ -package com.test.base; - -import java.io.InputStream; - -import com.base.Constant; -import com.base.Resource; - -public class ResourceTest { - - public static void main(String[] args) { - Resource ss = new Resource(); - Resource.readPropertiesFile(Constant.SYSTEM_PROPERTIES_FIEL_PATH); - - } - -}