修复bug

src/com/platform/service/DataInfoService.java

@@ -1,9 +1,10 @@
 
 package com.platform.service;
 
+import java.util.List;
+
 import org.springframework.ui.ModelMap;
 
-import com.platform.dao.DataInfoDao;
 import com.platform.entities.DataInfoEntity;
 import com.platform.entities.PagerOptions;
 
@@ -12,5 +13,7 @@ public interface DataInfoService {
 
 	void deleteData(String[] id) throws Exception;
 	
+	void deleteData(List<Integer> ids) throws Exception;
+	
 	int save(DataInfoEntity data) throws Exception;
 }

src/com/platform/service/EncodeInfoService.java

@@ -5,7 +5,7 @@ import java.util.List;
 import com.platform.entities.EncodedInfoEntity;
 
 /**
- * 数据库业务逻辑处理接口
+ * 行政区划/系统数据库业务逻辑处理接口
  * 
  * @author wuming
  * 

src/com/platform/service/ICheckoutService.java

@@ -12,6 +12,8 @@ public interface ICheckoutService {
 	
 	public List<CheckoutEntity> checkAll(List<CheckoutEntity> list)  throws Exception;
 	
+	public List<CheckoutEntity> deleteAll(List<CheckoutEntity> list)  throws Exception;
+	
 	public int updateStandardInfo(PreDataInfo ck)  throws Exception;
 	
 	public Map<String, PreDataInfo> findDetail(CheckoutEntity ck)  throws Exception;

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

@@ -18,6 +18,7 @@ import com.platform.dao.PreDataInfoDao;
 import com.platform.entities.CheckoutEntity;
 import com.platform.entities.DataInfoEntity;
 import com.platform.entities.PreDataInfo;
+import com.platform.service.DataInfoService;
 import com.platform.service.ICheckoutService;
 import com.platform.utils.BeanCopy;
 import com.platform.utils.Configs;
@@ -26,6 +27,9 @@ import com.platform.utils.DateForm;
 @Service(value = "checkoutService")
 public class CheckoutServiceImpl implements ICheckoutService {
 	
+	@Resource(name = "dataInfoService")
+	private DataInfoService dataInfoService;
+	
 	@Resource(name = "preDataInfoDao")
 	private PreDataInfoDao preDataInfoDao;
 	
@@ -330,4 +334,20 @@ public class CheckoutServiceImpl implements ICheckoutService {
 		}
 		return true;
 	}
+
+	@Override
+	public List<CheckoutEntity> deleteAll(List<CheckoutEntity> list)
+			throws Exception {
+		List<Integer> dataIds = new ArrayList<Integer>();
+		for (CheckoutEntity checkoutEntity : list) {
+			dataIds.add(checkoutEntity.getDataId());
+		}
+		dataInfoService.deleteData(dataIds);
+		// 根据 dataIds 删除
+		 List<CheckoutEntity> result = new ArrayList<CheckoutEntity>();
+			if (list.size() > 0) {
+				result = findByCity(list.get(0).getCityName());
+			}
+		return result;
+	}
 }

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

@@ -1,9 +1,8 @@
-package com.platform.service;
+package com.platform.service.impl;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -19,7 +18,7 @@ import com.platform.dao.DataInfoDao;
 import com.platform.entities.DataInfoEntity;
 import com.platform.entities.PagerOptions;
 import com.platform.glusterfs.RemoveData;
-import com.platform.utils.Bean2MapUtils;
+import com.platform.service.DataInfoService;
 import com.platform.utils.Configs;
 
 @Service(value = "dataInfoService")
@@ -110,6 +109,11 @@ public class DataInfoServiceImp implements DataInfoService {
 		for(String idx: id){
 			ids.add(Integer.parseInt(idx));
 		}
+		deleteData(ids);
+	}
+
+	@Override
+	public void deleteData(List<Integer> ids) throws Exception {
 		if (ids.size() > 0) {
 			//数据在不在？
 			List<String> paths = dfdDao.getIdIsExist(ids);
@@ -137,6 +141,7 @@ public class DataInfoServiceImp implements DataInfoService {
 				dfdDao.removes(ids);			
 			}
 		}
+		
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package com.platform.service;
+package com.platform.service.impl;
 
 import java.util.List;
 
@@ -8,9 +8,10 @@ import org.springframework.stereotype.Service;
 
 import com.platform.dao.EncodeInfoDao;
 import com.platform.entities.EncodedInfoEntity;
+import com.platform.service.EncodeInfoService;
 
 /**
- * 业务逻辑的具体实现类
+ * 行政区划/系统业务逻辑的具体实现类
  * 
  * @author wuming
  * 

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

@@ -106,7 +106,7 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 			try {
 				PreDataInfo pre = new PreDataInfo();
 				//excel数据  --> java bean
-				List<PreDataInfo> subPreData = ExcelOperation.readExcel4Update(workbook,  Constant.EXCEL_TEMPLATE_INIT_ROW, 0, pre, "id", "workRange","sysCode","updateTime","userTablespaceStatus", "checkoutIndicateStatus", "checkoutPayStatus", "userTablespacePath", "checkoutIndicatePath", "checkoutPayPath", "sqlList", "dataVersion", "collectingTime", "collUpdate");
+				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;
@@ -265,7 +265,7 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 			XSSFWorkbook result = null;
 			try {
 				workbook = new XSSFWorkbook(res.getInputStream());
-				result = ExcelOperation.writeExcelTemplate(workbook, Constant.EXCEL_TEMPLATE_INIT_ROW, 0, 25, list, "id", "workRange","sysCode","updateTime","userTablespaceStatus", "checkoutIndicateStatus", "checkoutPayStatus", "userTablespacePath", "checkoutIndicatePath", "checkoutPayPath", "sqlList", "dataVersion", "collectingTime", "collUpdate");
+				result = ExcelOperation.writeExcelTemplate(workbook, Constant.EXCEL_TEMPLATE_INIT_ROW, 0, 25, list, "id", "dataId", "workRange","sysCode","updateTime","userTablespaceStatus", "checkoutIndicateStatus", "checkoutPayStatus", "userTablespacePath", "checkoutIndicatePath", "checkoutPayPath", "sqlList", "dataVersion", "collectingTime", "collUpdate");
 			} catch (IllegalArgumentException
 					| IllegalAccessException | IOException e) {
 				errList.add(e.getMessage());

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

@@ -1,38 +1,32 @@
 package com.platform.service.impl;
 
-import java.beans.IntrospectionException;
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
 
-import net.sf.json.regexp.RegexpUtils;
-
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Service;
 
 import com.platform.dao.PreDataInfoDao;
 import com.platform.entities.DefaultDataDescription;
-import com.platform.entities.SqlFileInfoEntity;
 import com.platform.entities.PreDataInfo;
+import com.platform.entities.SqlFileInfoEntity;
 import com.platform.service.IScriptMakeService;
 import com.platform.utils.BeanCopy;
 import com.platform.utils.Compare4SqlFilesEntity;
 import com.platform.utils.Configs;
 import com.platform.utils.Constant;
+import com.platform.utils.DateForm;
 import com.platform.utils.FileOperateHelper;
 import com.platform.utils.ThreadRemoveFile;
 import com.platform.utils.XmlOperationByDom4j;
 
-import dk.brics.automaton.RegExp;
-
 @Service(value = "scriptMakeService")
 public class ScriptMakeService implements IScriptMakeService {
 
@@ -97,7 +91,7 @@ public class ScriptMakeService implements IScriptMakeService {
 
 			XmlOperationByDom4j
 					.createXml(FileOperateHelper.addLastSeparator(areaPath)
-							+ key + ".xml", defList, "Data_info", "id", "workRange","sysCode","updateTime","userTablespaceStatus", "checkoutIndicateStatus", "checkoutPayStatus", "userTablespacePath", "checkoutIndicatePath", "checkoutPayPath", "sqlList", "dataVersion", "collectingTime", "collUpdate");
+							+ key + ".xml", defList, "Data_info", "id", "dataId","workRange","sysCode","updateTime","userTablespaceStatus", "checkoutIndicateStatus", "checkoutPayStatus", "userTablespacePath", "checkoutIndicatePath", "checkoutPayPath", "sqlList", "dataVersion", "collectingTime", "collUpdate");
 		}
 		log.info("makeXml--end");
 		return 1;
@@ -108,15 +102,17 @@ public class ScriptMakeService implements IScriptMakeService {
 		List<PreDataInfo> systemDataInfo = preDataInfoDao.findAll();
 		// 查找 Configs.SQL_SCRIPT_PATH_LAST 路径下的 所有的文件：路径
 		Map<String, String> sqlFilePathsLast = new HashMap<String, String>();
-		sqlFilePathsLast = getAllFile(sqlFilePathsLast,
+		Map<String, String> timeMapLast = new HashMap<String, String>();
+		sqlFilePathsLast = getAllFile(sqlFilePathsLast,timeMapLast, 
 				Configs.SQL_SCRIPT_PATH_LAST);
 		// 遍历 查找 Configs.SQL_SCRIPT_PATH_STANDARD 脚本文件 放入集合中
 		Map<String, String> sqlFilePathsStandard = new HashMap<String, String>();
-		sqlFilePathsStandard = getAllFile(sqlFilePathsStandard,
+		Map<String, String> timeMapStandard = new HashMap<String, String>();
+		sqlFilePathsStandard = getAllFile(sqlFilePathsStandard,timeMapStandard, 
 				Configs.SQL_SCRIPT_PATH_STANDARD);
 		// 填充 脚本状态、位置的信息
 		List<SqlFileInfoEntity> result = setScript(systemDataInfo,
-				sqlFilePathsStandard, sqlFilePathsLast);
+				sqlFilePathsStandard, sqlFilePathsLast, timeMapLast, timeMapStandard);
 		return result;
 	}
 
@@ -127,26 +123,26 @@ public class ScriptMakeService implements IScriptMakeService {
 		String path2 = "";
 		switch (name) {
 			case "userTableStatus":
-				path1 = form.getUserTableScriptPathStandard();
+				path1 = form.getUserTableStatusPathStandard();
 				map.put("data1Path", path1);
 				map.put("data1", fileReader(path1));
-				path2 = form.getUserTableScriptPathLast();
+				path2 = form.getUserTableStatusPathLast();
 				map.put("data2Path", path2);
 				map.put("data2", fileReader(path2));
 				break;
 			case "ckIndicateStatus":
-				path1 = form.getCkIndicateScriptPathStandard();
+				path1 = form.getCkIndicateStatusPathStandard();
 				map.put("data1Path", path1);
 				map.put("data1", fileReader(path1));
-				path2 = form.getCkIndicateScriptPathLast();
+				path2 = form.getCkIndicateStatusPathLast();
 				map.put("data2Path", path2);
 				map.put("data2", fileReader(path2));
 				break;
 			case "ckPayStatus":
-				path1 = form.getCkPayScriptPathStandard();
+				path1 = form.getCkPayStatusPathStandard();
 				map.put("data1Path", path1);
 				map.put("data1", fileReader(path1));
-				path2 = form.getCkPayScriptPathLast();
+				path2 = form.getCkPayStatusPathLast();
 				map.put("data2Path", path2);
 				map.put("data2", fileReader(path2));
 				break;
@@ -174,34 +170,34 @@ public class ScriptMakeService implements IScriptMakeService {
 //		选择哪种类型的 脚本  path 可能 = null
 		switch (type) {
 			case "userTableStatus":
-				standardPath = form.getUserTableScriptPathStandard();
+				standardPath = form.getUserTableStatusPathStandard();
 				if (null == standardPath || standardPath.isEmpty()) {
 					File file = new File(FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + form.getAreaCode());
 					file.mkdir();
 					standardPath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD) + form.getAreaCode()
 							+ File.separator + "UserTablespace_" + form.getAreaCode() + "_" + form.getSysCode() + ".sql";
 				}
-				lastPath = form.getUserTableScriptPathLast();
+				lastPath = form.getUserTableStatusPathLast();
 				break;
 			case "ckIndicateStatus":
-				standardPath = form.getCkIndicateScriptPathStandard();
+				standardPath = form.getCkIndicateStatusPathStandard();
 				if (null == standardPath || standardPath.isEmpty()) {
 					File file = new File(FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + form.getAreaCode());
 					file.mkdir();
 					standardPath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD) + form.getAreaCode()
 							+ File.separator + "Checkout_Indicate_" + form.getAreaCode() + "_" + form.getSysCode() + ".sql";
 				}
-				lastPath = form.getCkIndicateScriptPathLast();
+				lastPath = form.getCkIndicateStatusPathLast();
 				break;
 			case "ckPayStatus":
-				standardPath = form.getCkPayScriptPathStandard();
+				standardPath = form.getCkPayStatusPathStandard();
 				if (null == standardPath || standardPath.isEmpty()) {
 					File file = new File(FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD)  + form.getAreaCode());
 					file.mkdir();
 					standardPath = FileOperateHelper.addLastSeparator(Configs.SQL_SCRIPT_PATH_STANDARD) + form.getAreaCode()
 							+ File.separator + "Checkout_Pay_" + form.getAreaCode() + "_" + form.getSysCode() + ".sql";
 				}
-				lastPath = form.getCkPayScriptPathLast();
+				lastPath = form.getCkPayStatusPathLast();
 				break;
 			default:
 				map.put("err", "请选择脚本类型！");
@@ -259,17 +255,19 @@ public class ScriptMakeService implements IScriptMakeService {
 	 * @param path
 	 * @return
 	 */
-	public Map<String, String> getAllFile(Map<String, String> ps, String path) {
+	public Map<String, String> getAllFile(Map<String, String> ps, Map<String, String> timeMap,String path) {
 		File f = new File(path);
 		String name = f.getName();
 		// 如果是 sql文件
-		if (name.endsWith(".sql") || name.endsWith(".SQL"))
+		if (name.endsWith(".sql") || name.endsWith(".SQL")){
 			ps.put(name.toLowerCase(), f.getAbsolutePath());
+			timeMap.put(name.toLowerCase(), DateForm.date2StringBysecond(new Date(f.lastModified())));
+		}
 		if (f.exists()) {
 			String[] subpaths = f.list();
 			if (null != subpaths) {
 				for (String tmppath : subpaths) {
-					getAllFile(ps, f.getAbsolutePath() + "/" + tmppath);
+					getAllFile(ps, timeMap, f.getAbsolutePath() + "/" + tmppath);
 				}
 			}
 		}
@@ -287,52 +285,80 @@ public class ScriptMakeService implements IScriptMakeService {
 	 */
 	private List<SqlFileInfoEntity> setScript(List<PreDataInfo> systemDataInfo,
 			Map<String, String> sqlFilePathsStandard,
-			Map<String, String> sqlFilePathsLast) {
+			Map<String, String> sqlFilePathsLast,Map<String, String> timeMapLast,
+			Map<String, String> timeMapStandard) {
 		List<SqlFileInfoEntity> fileEntitys = new ArrayList<SqlFileInfoEntity>();
 		for (PreDataInfo preDataInfo : systemDataInfo) {
 			SqlFileInfoEntity myfile = new SqlFileInfoEntity();
 			// 复制
 			BeanCopy.copyBean(preDataInfo, myfile);
+			//---------- 脚本的位置  ------
 			// 归档表空间脚本的位置-
 			String TablePathStandard = getFilePath("UserTablespace_",
 					sqlFilePathsStandard, myfile, ".sql");
-			myfile.setUserTableScriptPathStandard(TablePathStandard);
+			myfile.setUserTableStatusPathStandard(TablePathStandard);
 			// 归档预算 脚本的位置-
 			String indicatePathStandard = getFilePath("Checkout_Indicate_",
 					sqlFilePathsStandard, myfile, ".sql");
-			myfile.setCkIndicateScriptPathStandard(indicatePathStandard);
+			myfile.setCkIndicateStatusPathStandard(indicatePathStandard);
 			// 归档表空间脚本的位置-
 			String payPathStandard = getFilePath("Checkout_Pay_",
 					sqlFilePathsStandard, myfile, ".sql");
-			myfile.setCkPayScriptPathStandard(payPathStandard);
+			myfile.setCkPayStatusPathStandard(payPathStandard);
 			// 最新表空间脚本的位置-
 			String TablePathLast = getFilePath("UserTablespace_",
 					sqlFilePathsLast, myfile, ".sql");
-			myfile.setUserTableScriptPathLast(TablePathLast);
+			myfile.setUserTableStatusPathLast(TablePathLast);
 			// 最新预算 脚本的位置-
 			String indicatePathLast = getFilePath("Checkout_Indicate_",
 					sqlFilePathsLast, myfile, ".sql");
-			myfile.setCkIndicateScriptPathLast(indicatePathLast);
+			myfile.setCkIndicateStatusPathLast(indicatePathLast);
 			// 最新表空间脚本的位置-
 			String payPathLast = getFilePath("Checkout_Pay_", sqlFilePathsLast,
 					myfile, ".sql");
-			myfile.setCkPayScriptPathLast(payPathLast);
+			myfile.setCkPayStatusPathLast(payPathLast);
+			
+			//-------文件最后更新-时间-------
+		//	时间
+			String uttimeStandard = getFilePath("UserTablespace_",
+					timeMapStandard, myfile, ".sql");
+			myfile.setUserTableStatusStandardModified(uttimeStandard);
+			// 归档预算 脚本的时间-
+			String indicateTimeStandard = getFilePath("Checkout_Indicate_",
+					timeMapStandard, myfile, ".sql");
+			myfile.setCkIndicateStatusStandardModified(indicateTimeStandard);
+			// 归档表空间脚本的时间-
+			String payTimeStandard = getFilePath("Checkout_Pay_",
+					timeMapStandard, myfile, ".sql");
+			myfile.setCkPayStatusStandardModified(payTimeStandard);
+			// 最新表空间脚本的时间-
+			String utTimeLast = getFilePath("UserTablespace_",
+					timeMapLast, myfile, ".sql");
+			myfile.setUserTableStatusLastModified(utTimeLast);
+			// 最新预算 脚本的时间-
+			String indicateTimeLast = getFilePath("Checkout_Indicate_",
+					timeMapLast, myfile, ".sql");
+			myfile.setCkIndicateStatusLastModified(indicateTimeLast);
+			// 最新表空间脚本的时间-
+			String payTimeLast = getFilePath("Checkout_Pay_", timeMapLast,
+					myfile, ".sql");
+			myfile.setCkPayStatusLastModified(payTimeLast);
 			// 设置 状态
 			if (null != myfile.getDataBaseType()) {
 				if ("ORACLE".equals(myfile.getDataBaseType().toUpperCase())) {
 					myfile.setUserTableStatus(getStatus(
-							myfile.getUserTableScriptPathStandard(),
+							myfile.getUserTableStatusPathStandard(),
-							myfile.getUserTableScriptPathLast()));
+							myfile.getUserTableStatusPathLast()));
 				} else {
 					myfile.setUserTableStatus(4);
 				}
 			}
 			myfile.setCkIndicateStatus(getStatus(
-					myfile.getCkIndicateScriptPathStandard(),
+					myfile.getCkIndicateStatusPathStandard(),
-					myfile.getCkIndicateScriptPathLast()));
+					myfile.getCkIndicateStatusPathLast()));
 			myfile.setCkPayStatus(getStatus(
-					myfile.getCkPayScriptPathStandard(),
+					myfile.getCkPayStatusPathStandard(),
-					myfile.getCkPayScriptPathLast()));
+					myfile.getCkPayStatusPathLast()));
 			myfile.setSysStatus(getTotalStatus(myfile));
 			fileEntitys.add(myfile);
 		}

src/com/platform/service/thread/ThreadMoveData.java

@@ -24,8 +24,8 @@ import com.platform.glusterfs.CheckoutMD5;
 import com.platform.glusterfs.CopyData;
 import com.platform.glusterfs.ShowData;
 import com.platform.service.DataInfoService;
-import com.platform.service.DataInfoServiceImp;
 import com.platform.service.IMoveDataService;
+import com.platform.service.impl.DataInfoServiceImp;
 import com.platform.service.impl.MoveDataServiceImpl;
 import com.platform.utils.Bean2MapUtils;
 import com.platform.utils.Constant;