修改所有bug-2016-11-10

src/com/platform/controller/CheckoutController.java

@@ -147,13 +147,13 @@ public class CheckoutController extends BaseController {
 	public ModelMap deleteList(@RequestBody List<CheckoutEntity> form, HttpServletRequest req, HttpServletResponse res) throws Exception {
 		ModelMap modelMap = new ModelMap();
 		if (null != form) {
-			log.info("---------/checkList--- "+ form.size());
+			log.info("---------/deleteList--- "+ form.size());
 			List<CheckoutEntity> result = checkoutService.deleteAll(form);
 			modelMap.addAttribute("data", result);
 			modelMap.addAttribute("length", result.size());
 		}
 		else {
-			log.info("---------/checkList--- "+ form);
+			log.info("---------/deleteList--- "+ form);
 		}
 		return modelMap;
 	}

src/com/platform/controller/DataModelController.java

@@ -102,7 +102,7 @@ public class DataModelController extends BaseController {
 				sb.append(str).append(":").append("null").append(",");
 			}
 		}
-		Configs.CONSOLE_LOGGER.info(sb.deleteCharAt(sb.length() - 1)
+		log.info(sb.deleteCharAt(sb.length() - 1)
 				.append("}").toString());
 		PagerOptions pagerOptions = (PagerOptions) UtilsHelper
 				.newObjAndSetAttrsByClass(PagerOptions.class, params);

src/com/platform/controller/ExcelController.java

@@ -49,6 +49,7 @@ import com.platform.entities.ResumableInfoStorage;
 import com.platform.service.IPreDataInfoService;
 import com.platform.service.IScriptMakeService;
 import com.platform.utils.Configs;
+import com.platform.utils.FileOperateHelper;
 import com.platform.utils.HttpUtils;
 import com.platform.utils.ThreadRemoveFile;
 import com.platform.utils.UtilsHelper;
@@ -242,13 +243,8 @@ public class ExcelController extends BaseController{
 		log.info(jsonlist.size());
 		List<String> listPath = new ArrayList<String>();
 		// 末尾 含有 /(linux)
-		Pattern pattern2 = Pattern.compile("\\/$");
-		Matcher matcher2 = pattern2.matcher(Configs.FILE_UPLOAD_PATH);
 		// 加上 最后 的 / 
-		String dirPath = Configs.FILE_UPLOAD_PATH;
+		String dirPath = FileOperateHelper.addLastSeparator(Configs.FILE_UPLOAD_PATH);;
-		if (!matcher2.find()) {
-			dirPath = dirPath + File.separator;
-		}
 		for (String p : jsonlist) {
 			listPath.add(dirPath + p);
 		}
@@ -257,7 +253,7 @@ public class ExcelController extends BaseController{
 			//导入
 			result = preDataInfoService.importExcel(listPath);
 			//失败
-			if (result.containsKey("fileUnExist") || result.containsKey("areaUnImport")) {
+			if (result.containsKey("fileUnExist")/* || result.containsKey("areaUnImport")*/) {
 				modelMap.addAttribute("data", result);
 				modelMap.addAttribute("code","3001");
 				response.setStatus(500);
@@ -285,6 +281,7 @@ public class ExcelController extends BaseController{
 			//删除失败时--启用线程去删除
 			new ThreadRemoveFile(failedDelete).start();
 		}
+		log.info("success : "+modelMap);
 		return modelMap;
 	}
 	

src/com/platform/controller/FilePackageController.java

@@ -129,4 +129,61 @@ public class FilePackageController extends BaseController {
 		modelMap.addAttribute("length", results.size());
 		return modelMap;
 	}
+	
+	/**
+	 * 一键归档
+	 * @param type
+	 * @param opt
+	 * @param form
+	 * @param req
+	 * @param res
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/totalOnholeSqlFile", method = RequestMethod.POST)
+	@ResponseBody
+	public ModelMap totalOnholeSqlFile(@RequestBody List<SqlFileInfoEntity> forms,
+			HttpServletRequest req, HttpServletResponse res) throws Exception {
+		log.info("--------- /totalOnholeSqlFile --- " + forms +"  "+ forms.size());
+		ModelMap modelMap = new ModelMap();
+		if (forms.size() > 0) {
+			Map<String, Object> result  = scriptMakeService.totalOnholeSqlFile(forms);
+			if (result.containsKey("nosqlfile")) {
+				modelMap.addAllAttributes(result);
+			}
+		}
+		List<SqlFileInfoEntity> results = scriptMakeService.findAllFiles();
+		modelMap.addAttribute("data", results);
+		modelMap.addAttribute("length", results.size());
+		return modelMap;
+	}
+	
+	/**
+	 * 一键审核
+	 * @param type
+	 * @param opt
+	 * @param form
+	 * @param req
+	 * @param res
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/totalVerifySqlFile", method = RequestMethod.POST)
+	@ResponseBody
+	public ModelMap totalVerifySqlFile(@RequestBody List<SqlFileInfoEntity> forms,
+			HttpServletRequest req, HttpServletResponse res) throws Exception {
+		log.info("--------- /totalOnholeSqlFile --- " + forms +"  "+ forms.size());
+		ModelMap modelMap = new ModelMap();
+		if (forms.size() > 0) {
+			Map<String, Object> result  = scriptMakeService.totalVerifySqlFile(forms);
+			if (result.containsKey("nosqlfile")) {
+				modelMap.addAllAttributes(result);
+				res.setStatus(500);
+			}
+		}
+		List<SqlFileInfoEntity> results = scriptMakeService.findAllFiles();
+		modelMap.addAttribute("data", results);
+		modelMap.addAttribute("length", results.size());
+		return modelMap;
+	}
 }

src/com/platform/entities/DefaultDataDescription.java

@@ -28,7 +28,7 @@ public class DefaultDataDescription {
 
 	private String sys_description;
 
-	private String sys_develope;
+	private String sys_developer;
 
 	private String database;
 
@@ -239,15 +239,15 @@ public class DefaultDataDescription {
 	/**
 	 * @return the sys_develope
 	 */
-	public String getSys_develope() {
+	public String getSys_developer() {
-		return sys_develope;
+		return sys_developer;
 	}
 
 	/**
 	 * @param sys_develope the sys_develope to set
 	 */
-	public void setSys_develope(String sys_develope) {
+	public void setSys_developer(String sys_develope) {
-		this.sys_develope = sys_develope;
+		this.sys_developer = sys_develope;
 	}
 
 	/**
@@ -449,7 +449,7 @@ public class DefaultDataDescription {
 
 		sys_description = pre.getFunctionDetails();
 
-		sys_develope = pre.getDeveloperFullName();
+		sys_developer = pre.getDeveloperFullName();
 
 		database = pre.getDataBaseType();
 

src/com/platform/entities/SqlFileInfoEntity.java

@@ -20,6 +20,7 @@ public class SqlFileInfoEntity{
 	/**	数据库类型 */
 	private String dataBaseType;
 	
+	/** 状态   (含义，操作) ->  0：（有缺失，上传） ； 1： （正常，查看）； 2：（待归档，归档） ； 3： （待审核，审核） */
 	private int userTableStatus;
 	
 	private String userTableStatusPathLast;
@@ -30,6 +31,7 @@ public class SqlFileInfoEntity{
 	
 	private String userTableStatusStandardModified;
 	
+	/** 状态   (含义，操作) ->  0：（有缺失，上传） ； 1： （正常，查看）； 2：（待归档，归档） ； 3： （待审核，审核） */
 	private int ckPayStatus;
 	
 	private String ckPayStatusPathLast;
@@ -40,6 +42,7 @@ public class SqlFileInfoEntity{
 	
 	private String ckPayStatusStandardModified;
 	
+	/** 状态   (含义，操作) ->  0：（有缺失，上传） ； 1： （正常，查看）； 2：（待归档，归档） ； 3： （待审核，审核） */
 	private int ckIndicateStatus;
 	
 	private String ckIndicateStatusPathLast;

src/com/platform/form/ScriptForm.java

@@ -22,17 +22,18 @@ public class ScriptForm {
 	 * @param content the content to set
 	 */
 	public void setContent(String content) {
-		Properties pro = System.getProperties();
+//		Properties pro = System.getProperties();
-		String osName = pro.getProperty("os.name");
+//		String osName = pro.getProperty("os.name");
-		try {
+//		try {
-		if("Linux".equals(osName)||"linux".equals(osName)){
+//		if("Linux".equals(osName)||"linux".equals(osName)){
-			this.content = new String(content.getBytes("iso-8859-1"),"UTF-8");
+//			this.content = new String(content.getBytes("iso-8859-1"),"UTF-8");
-		}
+//		}
-		else {
+//		else {
-			this.content = new String(content.getBytes("iso-8859-1"),"GBK");
+//			this.content = new String(content.getBytes("iso-8859-1"),"GBK");
-		}
+//		}
-		} catch (UnsupportedEncodingException e) {
+//		} catch (UnsupportedEncodingException e) {
-		}
+//		}
+		this.content = content;
 	}
 
 	/**

src/com/platform/service/IScriptMakeService.java

@@ -26,4 +26,16 @@ public interface IScriptMakeService {
 	 */
 	public Map<String, Object> handleSqlFile(String type, String opt, String content, SqlFileInfoEntity form);
 	
+	/** 一键审核
+	 * @param forms
+	 * @return
+	 */
+	public Map<String, Object> totalOnholeSqlFile(List<SqlFileInfoEntity> forms);
+	
+	/** 一键审核
+	 * @param forms
+	 * @return
+	 */
+	public Map<String, Object> totalVerifySqlFile(List<SqlFileInfoEntity> forms);
+	
 }

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

@@ -338,14 +338,19 @@ public class CheckoutServiceImpl implements ICheckoutService {
 			throws Exception {
 		List<Integer> dataIds = new ArrayList<Integer>();
 		for (CheckoutEntity checkoutEntity : list) {
-			dataIds.add(checkoutEntity.getDataId());
+			int dataInfoId = checkoutEntity.getDataId();
+			if (dataInfoId > 0) {
+				dataIds.add(dataInfoId);
+			}
 		}
-		dataInfoService.deleteData(dataIds);
+		if (dataIds.size() > 0) {
+			dataInfoService.deleteData(dataIds);
 		// 根据 dataIds 删除
-		 List<CheckoutEntity> result = new ArrayList<CheckoutEntity>();
+		}
-			if (list.size() > 0) {
+		List<CheckoutEntity> result = new ArrayList<CheckoutEntity>();
-				result = findByCity(list.get(0).getCityName());
+		if (list.size() > 0) {
-			}
+			result = findByCity(list.get(0).getCityName());
+		}
 		return result;
 	}
 }

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

@@ -71,8 +71,6 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 		List<String> errFile = new ArrayList<String>();
 		// 待增加的
 		List<PreDataInfo> all2Insert = new ArrayList<PreDataInfo>();
-		// 待修改的
-		List<PreDataInfo> all2Update = new ArrayList<PreDataInfo>();
 		//excel读出的 所有
 		List<PreDataInfo> all = new ArrayList<PreDataInfo>();
 		//excel读出的 所有修改操作的数据
@@ -108,16 +106,18 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 				//excel数据  --> java bean
 				List<PreDataInfo> subPreData = ExcelOperation.readExcel4Update(workbook,  Constant.EXCEL_TEMPLATE_INIT_ROW, 0, pre, "id", "dataId", "workRange","sysCode","updateTime","userTablespaceStatus", "checkoutIndicateStatus", "checkoutPayStatus", "userTablespacePath", "checkoutIndicatePath", "checkoutPayPath", "sqlList", "dataVersion", "collectingTime", "collUpdate");
 				if (null != subPreData && subPreData.size() > 0) {
-					//是否是 同一个县区的 系统--是则 加入
+					// 是否是 同一个县区的 系统--是则 加入
 					boolean isSameArea = true;
 					String areaCode = subPreData.get(0).getAreaCode();
 					for (PreDataInfo preDataInfo : subPreData) {
 						if (!areaCode.equals(preDataInfo.getAreaCode())) {
-							isSameArea = false;
+							// TODO 不是同一个地区：  isSameArea = false;
+//							isSameArea = false;
 							errArea.add(areaCode);
 							break;
 						}
 					}
+					// 是同一个地区，则将 excel中的 待 操作的数据 全加载 到 all 里面
 					if (isSameArea) {
 						all.addAll(subPreData);
 					}
@@ -161,18 +161,51 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 				}
 			}
 		}
-		// 查系统 是否没有-（没有则在 pre_data_info添加新系统）：
+		//TODO 查 地区 是否没有-（没有则添加新地区）：
+		if (list4AddArea.size() > 0) {
+			this.addArea(list4AddArea);
+		}
+		//在 pre_data_info表中 新增 操作为（新增行政区划）的系统 -- start
+		List<PreDataInfo> allAreaInsert = new ArrayList<PreDataInfo>();
+		List<String> sysNamesArea = new ArrayList<String>();
+		for (PreDataInfo preDataInfo : list4AddArea) {
+			sysNamesArea.add(preDataInfo.getSysName());
+		}
+		//查询系统的code。
+		List<SystemEntity> listSystem = new ArrayList<SystemEntity>();
+//		if (sysNamesArea.size() > 0) {
+//			listSystem = systemCodeDao.findByName(sysNamesArea);
+//		}
+		Map<String, Integer> syscodeMap = new HashMap<String, Integer>();
+//		for (SystemEntity systemEntity : listSystem) {
+//			syscodeMap.put(systemEntity.getSystemName(), systemEntity.getCode());
+//		}
+//		for (PreDataInfo preDataInfo : list4AddArea) {
+//			PreDataInfo areaFull = new PreDataInfo();
+//			BeanCopy.copyBean(preDataInfo, areaFull);
+//			areaFull.setSysCode(syscodeMap.get(areaFull.getSysName()));
+//			areaFull.setUpdateTime(DateForm.date2StringBysecond(new Date()));
+//			allAreaInsert.add(areaFull);
+//		}
+		//TODO 去掉 已经导入的系统。。（例如 excel反复导入）
+		//在 pre_data_info表中 新增 操作为（新增行政区划）的系统
+		allAreaInsert = removeRepeat(list4AddArea);
+		if (allAreaInsert.size() > 0) {
+			list4AddSystem.addAll(allAreaInsert);
+//			insertBatch(allAreaInsert);
+		}
+		//TODO  查系统 是否没有-（没有则在 pre_data_info添加新系统）：
 		if (list4AddSystem.size() > 0) {
 			this.AddSystem(list4AddSystem);
 			List<String> sysNames = new ArrayList<String>(); 
 			for (PreDataInfo preDataInfo : list4AddSystem) {
 				sysNames.add(preDataInfo.getSysName());
 			}
-			List<SystemEntity> listSystem = new ArrayList<SystemEntity>();
+			listSystem = new ArrayList<SystemEntity>();
 			if (sysNames.size() > 0) {
 				listSystem = systemCodeDao.findByName(sysNames);
 			}
-			Map<String, Integer> syscodeMap = new HashMap<String, Integer>();
+			syscodeMap = new HashMap<String, Integer>();
 			for (SystemEntity systemEntity : listSystem) {
 				syscodeMap.put(systemEntity.getSystemName(), systemEntity.getCode());
 			}
@@ -188,43 +221,13 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 		//在 pre_data_info表中 新增 操作为（新增信息系统）的系统
 		all2Insert = removeRepeat(all2Insert);
 		if (all2Insert.size() > 0) {
-			preDataInfoDao.insertBatch(all2Insert);
+			insertBatch(all2Insert);
-		}
-		// 查 地区 是否没有-（没有则添加新地区）：
-		if (list4AddArea.size() > 0) {
-			this.addArea(list4AddArea);
-		}
-		//在 pre_data_info表中 新增 操作为（新增行政区划）的系统 -- start
-		List<PreDataInfo> allAreaInsert = new ArrayList<PreDataInfo>();
-		List<String> sysNamesArea = new ArrayList<String>();
-		for (PreDataInfo preDataInfo : list4AddArea) {
-			sysNamesArea.add(preDataInfo.getSysName());
-		}
-		//查询系统的code。
-		List<SystemEntity> listSystem = new ArrayList<SystemEntity>();
-		if (sysNamesArea.size() > 0) {
-			listSystem = systemCodeDao.findByName(sysNamesArea);
-		}
-		Map<String, Integer> syscodeMap = new HashMap<String, Integer>();
-		for (SystemEntity systemEntity : listSystem) {
-			syscodeMap.put(systemEntity.getSystemName(), systemEntity.getCode());
-		}
-		for (PreDataInfo preDataInfo : list4AddArea) {
-			PreDataInfo areaFull = new PreDataInfo();
-			BeanCopy.copyBean(preDataInfo, areaFull);
-			areaFull.setSysCode(syscodeMap.get(areaFull.getSysName()));
-			areaFull.setUpdateTime(DateForm.date2StringBysecond(new Date()));
-			allAreaInsert.add(areaFull);
-		}
-		//TODO 去掉 已经导入的系统。。（例如 excel反复导入）
-		//在 pre_data_info表中 新增 操作为（新增行政区划）的系统
-		allAreaInsert = removeRepeat(allAreaInsert);
-		if (allAreaInsert.size() > 0) {
-			preDataInfoDao.insertBatch(allAreaInsert);
 		}
+		
 		//在 pre_data_info表中 新增 操作为（新增行政区划）的系统 -- end
 		//在 pre_data_info表中 更新 操作为 (修改) 的系统
 		if (list4Update.size() > 0) {
+			// 待修改的
 			List<PreDataInfo> allUpdate = new ArrayList<PreDataInfo>();
 			// 查询系统 code 
 			for (PreDataInfo preDataInfo : list4Update) {
@@ -246,6 +249,7 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 				UpdateFull.setUpdateTime(DateForm.date2StringBysecond(new Date()));
 				allUpdate.add(UpdateFull);
 			}
+			//TODO 更新
 			for (PreDataInfo preEntity : allUpdate) {
 				preDataInfoDao.update(preEntity);
 			}
@@ -334,12 +338,12 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 		List<String> areacodeList = new ArrayList<String>();
 		Map<String,RegionalismEntity> areaMap = new HashMap<String, RegionalismEntity>();
 		for (PreDataInfo preDataInfo : list4AddArea) {
-			areacodeList.add(preDataInfo.getAreaCode());
+			areacodeList.add(preDataInfo.getAreaCode().toLowerCase());
 			RegionalismEntity region = new RegionalismEntity();
-			region.setCode(preDataInfo.getAreaCode());
+			region.setCode(preDataInfo.getAreaCode().toLowerCase());
 			region.setCityName(preDataInfo.getCityName());
 			region.setDistrictName(preDataInfo.getDistrictName());
-			areaMap.put(region.getCode(), region);
+			areaMap.put(region.getCode().toLowerCase(), region);
 		}
 		List<RegionalismEntity> existEntity = regionalismCodeDao.findExistRegionalism(areacodeList);
 		for (RegionalismEntity regionalismEntity : existEntity) {
@@ -352,7 +356,11 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 				insert2Regionalism.add(areaMap.get(key));
 			}
 			if (insert2Regionalism.size() > 0) {
-				regionalismCodeDao.insertBatch(insert2Regionalism);
+				try {
+					regionalismCodeDao.insertBatch(insert2Regionalism);
+				} catch (Exception e) {
+					log.error(" --    regionalismCodeDao.insertBatch()   ---  error ");
+				}
 				insertNum = insert2Regionalism.size();
 			}
 		}
@@ -474,4 +482,34 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 		return allResult;
 	}
 	
+	/** 批量插入--一次限定多少个(将allAreaInsert 分成 设定大小的 集合)  比如 allAreaInsert 有 100个， 按照 11个为一个集合分，可分成 10个集合
+	 * @param allAreaInsert 
+	 */
+	private void insertBatch(List<PreDataInfo> allAreaInsert) {
+		if (allAreaInsert.size() > 0) {
+			int listSize = allAreaInsert.size();
+			int loopSize = listSize/Configs.NUM_ONE_IMPORT_EXCEL;
+			if (loopSize * Configs.NUM_ONE_IMPORT_EXCEL != listSize) {
+				loopSize++;
+			}
+//			List<ArrayList<PreDataInfo>> list = new ArrayList<ArrayList<PreDataInfo>>();
+			List<PreDataInfo>[] list = new ArrayList[loopSize];
+			for (int i = 0; i < loopSize; i++) {
+				list[i] = new ArrayList<PreDataInfo>();
+//				list.add(new ArrayList<PreDataInfo>());
+			}
+			for (int i = 0; i < listSize; i++) {
+				list[i%loopSize].add(allAreaInsert.get(i));
+//				list.get(i%loopSize).add(allAreaInsert.get(i));
+			}
+			for (List<PreDataInfo> arrayList : list) {
+				try {
+					preDataInfoDao.insertBatch(arrayList);
+				} catch (Exception e) {
+					log.error(e.getStackTrace());
+				}
+			}
+		}
+	}
+	
 }

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

@@ -47,7 +47,7 @@ public class ScriptMakeService implements IScriptMakeService {
 		sb.append("市\t县（市、区）\t行政区划代码\r\n");
 		Map<String, Object> startData = new HashMap<String, Object>();
 		for (PreDataInfo preDataInfo : systemInfoList) {
-			startData.put(preDataInfo.getAreaCode(), preDataInfo);
+			startData.put(preDataInfo.getAreaCode().toLowerCase(), preDataInfo);
 
 		}
 		// 以地区为准--一个地区一个xml
@@ -57,10 +57,10 @@ public class ScriptMakeService implements IScriptMakeService {
 			sb.append("\t");
 			sb.append(preDataInfo.getDistrictName());
 			sb.append("\t");
-			sb.append(preDataInfo.getAreaCode());
+			sb.append(preDataInfo.getAreaCode().toLowerCase());
 			sb.append("\r\n");
 		}
-		FileOperateHelper.fileReWrite(path + Constant.cfgFileName,
+		FileOperateHelper.fileReWriteGBK(path + Constant.cfgFileName,
 				sb.toString());
 		log.info("makeCfg--end");
 		return 1;
@@ -74,7 +74,7 @@ public class ScriptMakeService implements IScriptMakeService {
 				.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD);
 		Map<String, List<Object>> map = new HashMap<String, List<Object>>();
 		for (PreDataInfo preDataInfo : systemInfoList) {
-			putSystemByAreaCode(map, preDataInfo.getAreaCode(), preDataInfo);
+			putSystemByAreaCode(map, preDataInfo.getAreaCode().toLowerCase(), preDataInfo);
 		}
 		// 一个地区一个xml
 		for (String key : map.keySet()) {
@@ -172,30 +172,30 @@ public class ScriptMakeService implements IScriptMakeService {
 			case "userTableStatus":
 				standardPath = form.getUserTableStatusPathStandard();
 				if (null == standardPath || standardPath.isEmpty()) {
-					File file = new File(FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + form.getAreaCode());
+					String spath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + form.getAreaCode().toLowerCase();
+					File file = new File(spath);
 					file.mkdir();
-					standardPath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD) + form.getAreaCode()
+					standardPath = spath + File.separator + "UserTablespace_" + form.getAreaCode().toLowerCase() + "_" + form.getSysCode() + ".sql";
-							+ File.separator + "UserTablespace_" + form.getAreaCode() + "_" + form.getSysCode() + ".sql";
 				}
 				lastPath = form.getUserTableStatusPathLast();
 				break;
 			case "ckIndicateStatus":
 				standardPath = form.getCkIndicateStatusPathStandard();
 				if (null == standardPath || standardPath.isEmpty()) {
-					File file = new File(FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + form.getAreaCode());
+					String spath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + form.getAreaCode().toLowerCase();
+					File file = new File(spath);
 					file.mkdir();
-					standardPath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD) + form.getAreaCode()
+					standardPath = spath + File.separator + "Checkout_Indicate_" + form.getAreaCode().toLowerCase() + "_" + form.getSysCode() + ".sql";
-							+ File.separator + "Checkout_Indicate_" + form.getAreaCode() + "_" + form.getSysCode() + ".sql";
 				}
 				lastPath = form.getCkIndicateStatusPathLast();
 				break;
 			case "ckPayStatus":
 				standardPath = form.getCkPayStatusPathStandard();
 				if (null == standardPath || standardPath.isEmpty()) {
-					File file = new File(FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + form.getAreaCode());
+					String spath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + form.getAreaCode().toLowerCase();
+					File file = new File(spath);
 					file.mkdir();
-					standardPath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD) + form.getAreaCode()
+					standardPath = spath + File.separator + "Checkout_Pay_" + form.getAreaCode().toLowerCase() + "_" + form.getSysCode() + ".sql";
-							+ File.separator + "Checkout_Pay_" + form.getAreaCode() + "_" + form.getSysCode() + ".sql";
 				}
 				lastPath = form.getCkPayStatusPathLast();
 				break;
@@ -213,12 +213,12 @@ public class ScriptMakeService implements IScriptMakeService {
 				break;
 				// 最新脚本 替换 标准脚本（即 以最新脚本为准 ）(归档或审核-替换)
 			case "replace":
-				FileOperateHelper.fileReWrite(standardPath, fileReader(lastPath));
+				FileOperateHelper.fileReWriteGBK(standardPath, fileReader(lastPath));
 				fileDelete(lastPath);
 				break;
 				//新增 标准的脚本（注意 造出 对应的 standardPath standardPath不能 = null ''）（上传）
 			case "add":
-				FileOperateHelper.fileReWrite(standardPath,content);
+				FileOperateHelper.fileReWriteGBK(standardPath,content);
 				break;
 				// （查看）
 			case "read":  
@@ -379,7 +379,7 @@ public class ScriptMakeService implements IScriptMakeService {
 	private String getFilePath(String prefix, Map<String, String> map,
 			SqlFileInfoEntity myf, String affix) {
 		StringBuffer sb = new StringBuffer();
-		sb.append(prefix).append(myf.getAreaCode()).append("_")
+		sb.append(prefix).append(myf.getAreaCode().toLowerCase()).append("_")
 				.append(myf.getSysCode()).append(affix);
 		String fileName = sb.toString().toLowerCase();
 		if (!map.containsKey(fileName)) {
@@ -439,7 +439,7 @@ public class ScriptMakeService implements IScriptMakeService {
 		}
 		for (Integer integer : numArr) {
 			if (integer != 1) {
-				result = result & integer;
+				result = result | integer;
 			}
 		}
 		return result;
@@ -467,4 +467,113 @@ public class ScriptMakeService implements IScriptMakeService {
 		}
 		return 1;
 	}
+
+	@Override
+	public Map<String, Object> totalOnholeSqlFile(List<SqlFileInfoEntity> forms) {
+		Map<String, Object> errMap = new HashMap<String, Object>();
+		List<String> errlist = new ArrayList<String>();
+		//待归档  status = 2
+		for (SqlFileInfoEntity sqlFile : forms) {
+			// 用户表空间脚本
+			if (sqlFile.getUserTableStatus() == 2) {
+				String standardPath = sqlFile.getUserTableStatusPathStandard();
+				if (null == standardPath || standardPath.isEmpty()) {
+					String spath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + sqlFile.getAreaCode().toLowerCase();
+					File file = new File(spath);
+					file.mkdir();
+					standardPath = spath + File.separator + "UserTablespace_" + sqlFile.getAreaCode().toLowerCase() + "_" + sqlFile.getSysCode() + ".sql";
+				}
+				String lastPath = sqlFile.getUserTableStatusPathLast();
+				if(!FileOperateHelper.singleFileMove(lastPath, standardPath)){
+					errlist.add(lastPath);
+				}
+			}
+			// 支付脚本
+			if (sqlFile.getCkPayStatus() == 2) {
+				String standardPath = sqlFile.getCkPayStatusPathStandard();
+				if (null == standardPath || standardPath.isEmpty()) {
+					String spath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + sqlFile.getAreaCode().toLowerCase();
+					File file = new File(spath);
+					file.mkdir();
+					standardPath = spath + File.separator + "Checkout_Pay_" + sqlFile.getAreaCode().toLowerCase() + "_" + sqlFile.getSysCode() + ".sql";
+				}
+				String lastPath = sqlFile.getCkPayStatusPathLast();
+				if(!FileOperateHelper.singleFileMove(lastPath, standardPath)){
+					errlist.add(lastPath);
+				}
+			}
+			// 可执行脚本 
+			if (sqlFile.getCkIndicateStatus() == 2) {
+				String standardPath = sqlFile.getCkIndicateStatusPathStandard();
+				if (null == standardPath || standardPath.isEmpty()) {
+					String spath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + sqlFile.getAreaCode().toLowerCase();
+					File file = new File(spath);
+					file.mkdir();
+					standardPath = spath + File.separator + "Checkout_Indicate_" + sqlFile.getAreaCode().toLowerCase() + "_" + sqlFile.getSysCode() + ".sql";
+				}
+				String lastPath = sqlFile.getCkIndicateStatusPathLast();
+				if(!FileOperateHelper.singleFileMove(lastPath, standardPath)){
+					errlist.add(lastPath);
+				}
+			}
+		}
+		if (errlist.size() > 0) {
+			errMap.put("nosqlfile", errlist);
+		}
+		return errMap;
+	}
+
+	@Override
+	public Map<String, Object> totalVerifySqlFile(List<SqlFileInfoEntity> forms) {
+		Map<String, Object> errMap = new HashMap<String, Object>();
+		List<String> errlist = new ArrayList<String>();
+		//待归档  status = 2
+		for (SqlFileInfoEntity sqlFile : forms) {
+			// 用户表空间脚本
+			if (sqlFile.getUserTableStatus() == 3) {
+				String standardPath = sqlFile.getUserTableStatusPathStandard();
+				if (null == standardPath || standardPath.isEmpty()) {
+					String spath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + sqlFile.getAreaCode().toLowerCase();
+					File file = new File(spath);
+					file.mkdir();
+					standardPath = spath + File.separator + "UserTablespace_" + sqlFile.getAreaCode().toLowerCase() + "_" + sqlFile.getSysCode() + ".sql";
+				}
+				String lastPath = sqlFile.getUserTableStatusPathLast();
+				if(!FileOperateHelper.singleFileMove(lastPath, standardPath)){
+					errlist.add(lastPath);
+				}
+			}
+			// 支付脚本
+			if (sqlFile.getCkPayStatus() == 3) {
+				String standardPath = sqlFile.getCkPayStatusPathStandard();
+				if (null == standardPath || standardPath.isEmpty()) {
+					String spath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + sqlFile.getAreaCode().toLowerCase();
+					File file = new File(spath);
+					file.mkdir();
+					standardPath = spath + File.separator + "Checkout_Pay_" + sqlFile.getAreaCode().toLowerCase() + "_" + sqlFile.getSysCode() + ".sql";
+				}
+				String lastPath = sqlFile.getCkPayStatusPathLast();
+				if(!FileOperateHelper.singleFileMove(lastPath, standardPath)){
+					errlist.add(lastPath);
+				}
+			}
+			// 可执行脚本 
+			if (sqlFile.getCkIndicateStatus() == 3) {
+				String standardPath = sqlFile.getCkIndicateStatusPathStandard();
+				if (null == standardPath || standardPath.isEmpty()) {
+					String spath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + sqlFile.getAreaCode().toLowerCase();
+					File file = new File(spath);
+					file.mkdir();
+					standardPath = spath + File.separator + "Checkout_Indicate_" + sqlFile.getAreaCode().toLowerCase() + "_" + sqlFile.getSysCode() + ".sql";
+				}
+				String lastPath = sqlFile.getCkIndicateStatusPathLast();
+				if(!FileOperateHelper.singleFileMove(lastPath, standardPath)){
+					errlist.add(lastPath);
+				}
+			}
+		}
+		errMap.put("nosqlfile", errlist);
+		return errMap;
+	}
+
 }

src/com/platform/utils/Configs.java

@@ -73,4 +73,9 @@ public class Configs {
 	 * 多少 个月前的数据
 	 */
 	public static int dataBefore = 6;
+	
+	/**
+	 * 多少 个月前的数据
+	 */
+	public static int NUM_ONE_IMPORT_EXCEL = 12;
 }

src/com/platform/utils/ConfigsLoader.java

@@ -77,6 +77,8 @@ public class ConfigsLoader implements ServletContextListener {
 		
 		Configs.dataBefore = Integer.valueOf(properties.getProperty("dataBefore"));
 		
+		Configs.NUM_ONE_IMPORT_EXCEL = Integer.valueOf(properties.getProperty("numOneImportExcel"));
+		
 		HttpClientConstant.URL_IP_PORT = properties.getProperty("HttpClientConstant_URL_IP_PORT").trim();
 		
 		Constant.hostIp=properties.getProperty("gfs_control_ip").trim();

src/com/platform/utils/FileOperateHelper.java

@@ -6,6 +6,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -79,6 +80,40 @@ public class FileOperateHelper {
 			}
 		}
 	}
+	
+	/**
+	 * 以重写的方式将信息写入文件
+	 * 
+	 * @param path
+	 * @param message
+	 */
+	public static void fileReWriteGBK(String path, String message) {
+		if (null == path || "".equals(path)) {
+			return;
+		}
+		FileOutputStream out = null;
+		try {
+			File file = new File(path);
+			file.delete();
+			file.createNewFile();
+			out = new FileOutputStream(file, true); // 如果追加方式用true
+			StringBuffer sb = new StringBuffer();
+			sb.append(message);
+			out.write(sb.toString().getBytes("GBK"));
+			out.close();
+		} catch (IOException e) {
+			log.error(e.getStackTrace());
+		}
+		finally{
+			if (null != out) {
+				try {
+					out.close();
+				} catch (IOException e) {
+					log.error(e.getStackTrace());
+				}
+			}
+		}
+	}
 
 	/**
 	 * 文件读取方法
@@ -115,7 +150,7 @@ public class FileOperateHelper {
 	}
 	
 	/**
-	 * 文件读取方法
+	 * 文件读取方法-GBK
 	 * @param path
 	 * @return
 	 */
@@ -131,7 +166,7 @@ public class FileOperateHelper {
 			if (!file.exists())
 				return "";
 			fis = new FileInputStream(file);
-			BufferedReader br = new BufferedReader(new InputStreamReader(fis));
+			BufferedReader br = new BufferedReader(new InputStreamReader(fis,"GBK"));
 			while ((tempString = br.readLine()) != null) {
 				sb.append(tempString+"\n");
 			}
@@ -165,7 +200,8 @@ public class FileOperateHelper {
 		if (path.length() < 1) {
 			return path;
 		}
-		Pattern pattern2 = Pattern.compile(File.separator+"$");
+		String sep = "\\"+File.separator;
+		Pattern pattern2 = Pattern.compile(sep+"$");
 		Matcher matcher2 = pattern2.matcher(path);
 		if (matcher2.find()) {
 			path = path.substring(0, path.length()-1);
@@ -173,4 +209,21 @@ public class FileOperateHelper {
 		}
 		return path;
 	}
+	
+	/** 单文件移动 
+	 * @param srcPath 源文件
+	 * @param dstPath 目标文件
+	 * @return
+	 */
+	public static boolean singleFileMove(String srcPath, String dstPath){
+		boolean isSuccess = false;
+		File dstfile = new File(dstPath);
+		dstfile.delete();
+		File srcfile = new File(srcPath);
+		if(srcfile.exists()){
+			// windows linux下通用的 迁移数据
+			isSuccess = srcfile.renameTo(dstfile);
+		}
+		return isSuccess;
+	}
 }

src/com/platform/utils/ZipCompressUtils.java

@@ -17,10 +17,10 @@ public class ZipCompressUtils {
 		
 		Properties pro = System.getProperties();
 		String osName = pro.getProperty("os.name");
-		if("Linux".equals(osName)||"linux".equals(osName)){
+		if(osName.contains("Linux")||osName.contains("linux")){
 			ProcessMyUtil.execCmdWaitAcquiescent("zip -r "+ FileOperateHelper.addLastSeparator(Configs.PACKAGE_DOWNLOAD_PATH) +"package.zip " + FileOperateHelper.addLastSeparator(Configs.PACKAGE_DOWNLOAD_PATH) + Configs.PACKAGE_NAME);
 		}
-		else if ("Windows".equals(osName) || "windows".equals(osName) ) {
+		else if (osName.contains("Windows") || osName.contains("windows")) {
 			// windows下压缩：
 			try {
 				// 解决中文文件夹名乱码的问题

src/com/platform/utils/excelUtils/ExcelOperation.java

@@ -163,9 +163,9 @@ public class ExcelOperation {
 		XSSFCell cell = null;
 		//excel总行数
 		int rowNum = sheet.getLastRowNum();
-        row = sheet.getRow(0);
+//        row = sheet.getRow(excelInitRow);
-        //excel总列数
+//        //excel总列数
-        int colNum = row.getPhysicalNumberOfCells();
+//        int colNum = row.getPhysicalNumberOfCells();
         // 填充数据的类的 属性个数
         int objColl = classz.getDeclaredFields().length;
         //如果有数据