diff --git a/src/com/base/MyException.java b/src/com/base/MyException.java new file mode 100644 index 00000000..36c40fb3 --- /dev/null +++ b/src/com/base/MyException.java @@ -0,0 +1,44 @@ + +/** + * 文件名 : MyException.java + * 版权 : <版权/公司名> + * 描述 : <描述> + * @author liliy + * 版本 : <版本> + * 修改时间： 2016年10月19日 + * 修改内容： <修改内容> + */ +package com.base; + +/** + * <一句话功能简述> + * <功能详细描述> + * @author liliy + * @version [版本号，2016年10月19日] + * @see [相关类/方法] + * @since [产品/模块版本] + */ + +public class MyException { + private String mess; + + public MyException() { + } + + /** + * <一句话功能简述> + * <功能详细描述> + * @see [类、类#方法、类#成员] + */ + public MyException(String mess) { + // TODO Auto-generated constructor stub + setMess(mess); + } + + public void setMess(String mess){ + this.mess=mess; + } + public String getMess(){ + return this.mess; + } +} \ No newline at end of file diff --git a/src/com/base/PostData.java b/src/com/base/PostData.java new file mode 100644 index 00000000..750e12c4 --- /dev/null +++ b/src/com/base/PostData.java @@ -0,0 +1,114 @@ + +/** + * 文件名 : PostObj.java + * 版权 : <版权/公司名> + * 描述 : <描述> + * @author liliy + * 版本 : <版本> + * 修改时间： 2016年10月18日 + * 修改内容： <修改内容> + */ +package com.base; + +import java.util.List; +import java.util.Stack; + +/** + * <一句话功能简述> + * <功能详细描述> + * @author liliy + * @version [版本号，2016年10月18日] + * @see [相关类/方法] + * @since [产品/模块版本] + */ + +public class PostData { + private Object data; + private Stack exceptionsStack; + /** + * <一句话功能简述> + * <功能详细描述> + * @see [类、类#方法、类#成员] + */ + public PostData() { + // TODO Auto-generated constructor stub + exceptionsStack=new Stack<>(); + } + public PostData(Object data) { + // TODO Auto-generated constructor stub + this.data=data; + exceptionsStack=new Stack<>(); + } + /** + * @return the data + */ + public Object getData() { + return data; + } + /** + * @param data the data to set + */ + public void setData(Object data) { + this.data = data; + } + /** + * + * <一句话功能简述> + * <功能详细描述> + * @param e + * @see [类、类#方法、类#成员] + */ + public void pushExceptionsStack(String mess){ + MyException myException=new MyException(mess); + exceptionsStack.push(myException); + } + public void pushExceptionsStackList(List messs){ + if(messs==null)return; + for(String mess:messs){ + MyException myException=new MyException(mess); + exceptionsStack.push(myException); + } + } + /** + * + * <一句话功能简述> + * <功能详细描述> + * @return + * @see [类、类#方法、类#成员] + */ + public MyException popExceptionsStack(){ + if (isEmptyExceptionsStack()){ + return null; + } + return exceptionsStack.pop(); + } + /** + * + * <一句话功能简述> + * <功能详细描述> + * @return + * @see [类、类#方法、类#成员] + */ + public boolean isEmptyExceptionsStack(){ + return exceptionsStack.empty(); + } + /** + * + * <一句话功能简述> + * <功能详细描述> + * @return + * @see [类、类#方法、类#成员] + */ + public Stack getExceptionsStack() { + return exceptionsStack; + } + /** + * @param exceptionsStack the exceptionsStack to set + */ + public void setExceptionsStack(Stack exceptionsStack) { + this.exceptionsStack = exceptionsStack; + } + +} + + diff --git a/src/com/base/TaskOperateData.java b/src/com/base/TaskOperateData.java new file mode 100644 index 00000000..8f4bfb04 --- /dev/null +++ b/src/com/base/TaskOperateData.java @@ -0,0 +1,182 @@ + +/** + * 文件名 : TaskOperateData.java + * 版权 : <版权/公司名> + * 描述 : <描述> + * @author liliy + * 版本 : <版本> + * 修改时间： 2016年11月2日 + * 修改内容： <修改内容> + */ +package com.base; + +import java.util.ArrayList; +import java.util.List; + +import com.platform.glusterfs.SetCluster; +import com.platform.utils.Constant; +import com.platform.utils.Support; + +/** + * 数据操作中记录 <功能详细描述> + * + * @author liliy + * @version [版本号，2016年11月2日] + * @see [相关类/方法] + * @since [产品/模块版本] + */ + +public class TaskOperateData { + /** + * 数据状态，0：准备迁移，1：表示正在迁移，2：表示迁移完成，正在MD5校验，3：表示校验成功，-1：表示迁移完成，校验失败,-2:表示迁移失败 + * 4:表示正在删除，5：表示删除完成，-3：表示删除失败 + */ + private int status = 1; + + /** + * 任务完成后返回状态 + */ + // private int taskReturn = 0; + + /** + * 任务拷贝数据总大小，以字节为单位 + */ + private Long allSize = 0L; + /** + * 已经拷贝了的大小 + */ + private Long completedSize = 0L; + /** + * 进度 + */ + private int progress = 0; + + /** + * 源路径和目的路径 + */ + private String sourcePath = null; + /** 目的路径 */ + private String destPath = null; + + /** + * 删除任务数据 + */ + private String removeDataName = null; + + /** + * 任务的开始时间和结束时间 + */ + private String startTime = null; + /** 结束时间 */ + private String endTime = null; + /** + * @return the status + */ + public int getStatus() { + return status; + } + /** + * @param status the status to set + */ + public void setStatus(int status) { + this.status = status; + } + /** + * @return the allSize + */ + public Long getAllSize() { + return allSize; + } + /** + * @param allSize the allSize to set + */ + public void setAllSize(Long allSize) { + this.allSize = allSize; + } + /** + * @return the completedSize + */ + public Long getCompletedSize() { + return completedSize; + } + /** + * @param completedSize the completedSize to set + */ + public void setCompletedSize(Long completedSize) { + this.completedSize = completedSize; + } + /** + * @return the progress + */ + public int getProgress() { + return progress; + } + /** + * @param progress the progress to set + */ + public void setProgress(int progress) { + this.progress = progress; + } + + /** + * @return the sourcePath + */ + public String getSourcePath() { + return sourcePath; + } + /** + * @param sourcePath the sourcePath to set + */ + public void setSourcePath(String sourcePath) { + this.sourcePath = sourcePath; + } + /** + * @return the destPath + */ + public String getDestPath() { + return destPath; + } + /** + * @param destPath the destPath to set + */ + public void setDestPath(String destPath) { + this.destPath = destPath; + } + /** + * @return the removeDataName + */ + public String getRemoveDataName() { + return removeDataName; + } + /** + * @param removeDataName the removeDataName to set + */ + public void setRemoveDataName(String removeDataName) { + this.removeDataName = removeDataName; + } + /** + * @return the startTime + */ + public String getStartTime() { + return startTime; + } + /** + * @param startTime the startTime to set + */ + public void setStartTime(String startTime) { + this.startTime = startTime; + } + /** + * @return the endTime + */ + public String getEndTime() { + return endTime; + } + /** + * @param endTime the endTime to set + */ + public void setEndTime(String endTime) { + this.endTime = endTime; + } + +} diff --git a/src/com/dao/mapper/data-details-mapper.xml b/src/com/dao/mapper/data-details-mapper.xml index cd99dcfd..91603b37 100644 --- a/src/com/dao/mapper/data-details-mapper.xml +++ b/src/com/dao/mapper/data-details-mapper.xml @@ -203,6 +203,18 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" extract_status, + + checkout_pay, + + + checkout_indicate, + + + start_month, + + + end_month, + ) VALUES( @@ -255,6 +267,18 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" #{extractStatus}, + + #{payResult}, + + + #{execResult}, + + + #{startMonth}, + + + #{endMonth}, + ) diff --git a/src/com/dao/mapper/dataInfoMoveTmpmapper.xml b/src/com/dao/mapper/dataInfoMoveTmpmapper.xml index 2668ebbd..a26c2ed3 100644 --- a/src/com/dao/mapper/dataInfoMoveTmpmapper.xml +++ b/src/com/dao/mapper/dataInfoMoveTmpmapper.xml @@ -61,7 +61,8 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" b.data_version dataVersion,b.submitted_batch submittedBatch,b.data_path dataPath,b.data_charset charset, b.collection_time collectingTime,b.collector_name collectorName,b.collector_contacts collectorContacts, b.data_year year,b.extract_status extractStatus,b.start_year startYear,b.end_year endYear, - b.volume_ip volumeIp,b.volume_path volumePath + b.volume_ip volumeIp,b.volume_path volumePath,b.checkout_pay payResult,b.checkout_indicate execResult, + b.start_month startMonth,b.end_month endMonth FROM move_data_tmp a LEFT JOIN data_details b ON a.system_code = b.system_code AND a.regionalism_code = b.regionalism_code AND a.fkid = b.id @@ -78,6 +79,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" a.id = #{id} + for update diff --git a/src/com/platform/controller/CheckoutController.java b/src/com/platform/controller/CheckoutController.java index dc2389fe..2776bbb7 100644 --- a/src/com/platform/controller/CheckoutController.java +++ b/src/com/platform/controller/CheckoutController.java @@ -26,6 +26,7 @@ import com.platform.service.ICheckoutService; @Controller @RequestMapping("/checkout") public class CheckoutController extends BaseController { + //日志 public final static Logger log = Logger.getLogger(CheckoutController.class); @Resource(name = "checkoutService") diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java index d4c110d1..29e34bf9 100644 --- a/src/com/platform/controller/DataModelController.java +++ b/src/com/platform/controller/DataModelController.java @@ -29,7 +29,7 @@ import com.platform.entities.GatherOracleInfo; import com.platform.form.PagerOptions; import com.platform.form.oracleForm; import com.platform.form.volumeMoveForm; -import com.platform.http.gfs.HttpUtils; +import com.platform.http.HttpUtils; import com.platform.service.DataInfoService; import com.platform.service.ICodeService; import com.platform.service.IGfsService; @@ -37,6 +37,7 @@ import com.platform.service.ILogRead; import com.platform.service.IMoveDataService; import com.platform.service.IGatherOracleService; import com.platform.service.IOracleExtractService; +import com.platform.service.IVolumeService; import com.platform.service.OracleStatusService; import com.platform.service.thread.ThreadExtractOracle; import com.platform.service.thread.ThreadGainOracleConnect; @@ -61,8 +62,8 @@ public class DataModelController extends BaseController { /** * gfs业务类 */ - @Resource(name = "gfsService") - private IGfsService gfsService; + @Resource(name = "volumeService") + private IVolumeService volumeService; /** * mysql相关业务 @@ -202,9 +203,8 @@ public class DataModelController extends BaseController { @RequestMapping(value = "/volume/list", method = RequestMethod.POST) @ResponseBody public String volumeList() throws Exception { - HttpUtils ht = new HttpUtils(); log.debug("-----/volume/list------"); - String rest = ht.sendPost("gfs/getAllvolume", null); + String rest = volumeService.getAllvolume(); return rest; } diff --git a/src/com/platform/controller/ExcelController.java b/src/com/platform/controller/ExcelController.java index b14b425d..473af3aa 100644 --- a/src/com/platform/controller/ExcelController.java +++ b/src/com/platform/controller/ExcelController.java @@ -4,6 +4,8 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.RandomAccessFile; +import java.io.StringWriter; +import java.io.Writer; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -16,7 +18,9 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sf.json.JSONArray; + + + import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; @@ -36,6 +40,8 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.commons.CommonsMultipartResolver; import com.base.BaseController; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import com.platform.entities.PreDataInfo; import com.platform.entities.ResumableInfo; import com.platform.entities.ResumableInfoStorage; @@ -55,6 +61,7 @@ import com.platform.utils.UtilsHelper; @RequestMapping("/fileOperation") public class ExcelController extends BaseController{ + private static ObjectMapper mapper = new ObjectMapper(); /** * 日志 */ @@ -259,8 +266,11 @@ public class ExcelController extends BaseController{ public ModelMap importExcel(HttpServletRequest request, HttpServletResponse response, @RequestBody String fileNameList) throws Exception { log.info("---importExcel---" + fileNameList); - JSONArray jsonArray = JSONArray.fromObject(fileNameList); - List jsonlist = (List) JSONArray.toCollection(jsonArray, String.class); + List jsonlist = mapper.readValue(fileNameList, new TypeReference>() {}); +// JavaType javaType = mapper.getTypeFactory().constructParametricType(List.class, String.class); + +// JSONArray jsonArray = JSONArray.fromObject(fileNameList); +// List jsonlist = (List) JSONArray.toCollection(jsonArray, String.class); ModelMap modelMap = new ModelMap(); if (null == jsonlist || jsonlist.size() == 0) { diff --git a/src/com/platform/controller/FolderController.java b/src/com/platform/controller/FolderController.java index caa31be6..efaec0fb 100644 --- a/src/com/platform/controller/FolderController.java +++ b/src/com/platform/controller/FolderController.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import com.base.BaseController; -import com.platform.entities.VolumeEntity; +import com.platform.entities.VolumeDataEntity; import com.platform.service.IGfsService; @@ -81,7 +81,7 @@ public class FolderController extends BaseController { @RequestMapping(value="/volume/findByName", method= RequestMethod.POST) public Object getVolumByName(String volumeName) throws Exception{ log.info(volumeName); - VolumeEntity result = gfsService.getOneVolume(volumeName); + VolumeDataEntity result = gfsService.getOneVolume(volumeName); return result; } } diff --git a/src/com/platform/controller/VolumeController.java b/src/com/platform/controller/VolumeController.java index f893db67..595d732a 100644 --- a/src/com/platform/controller/VolumeController.java +++ b/src/com/platform/controller/VolumeController.java @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import com.base.BaseController; -import com.platform.entities.VolumeEntity; -import com.platform.http.gfs.HttpUtils; +import com.platform.entities.VolumeDataEntity; +import com.platform.http.gfs.SetVolume; import com.platform.service.IVolumeService; import com.platform.utils.ThreadVolumeImm; @@ -33,9 +33,9 @@ public class VolumeController extends BaseController{ private IVolumeService volumeService; /** - * http 请求 客户端类 + * volumeClient 请求 客户端类 */ - HttpUtils ht = new HttpUtils(); + SetVolume volumeClient = new SetVolume(); /** volume更新 * @param res @@ -47,7 +47,7 @@ public class VolumeController extends BaseController{ @RequestMapping(value = "/volume/update", method = RequestMethod.POST) @ResponseBody public String volumeUpdate(HttpServletRequest res, HttpServletResponse req, - @RequestBody VolumeEntity form) throws Exception { + @RequestBody VolumeDataEntity form) throws Exception { log.error("/oracle/update"); int rest = volumeService.save(form); if (rest == 1) { @@ -56,7 +56,7 @@ public class VolumeController extends BaseController{ else { req.setStatus(500); } - String result = ht.sendPost("gfs/getAllvolume", null); + String result = volumeService.getAllvolume(); new ThreadVolumeImm("ThreadVolumeImm-in-VolumeController-update").start(); return result; } @@ -71,7 +71,7 @@ public class VolumeController extends BaseController{ @RequestMapping(value = "/volume/delete", method = RequestMethod.POST) @ResponseBody public String volumeDelete(HttpServletRequest res, HttpServletResponse req, - @RequestBody VolumeEntity entity) throws Exception { + @RequestBody VolumeDataEntity entity) throws Exception { log.error("/volume/delete"); int rest = volumeService.delete(entity); if (rest == 1) { @@ -80,7 +80,7 @@ public class VolumeController extends BaseController{ else { req.setStatus(500); } - String result = ht.sendPost("gfs/getAllvolume", null); + String result = volumeClient.getAllvolume(); new ThreadVolumeImm("ThreadVolumeImm-in-VolumeController-delete").start(); return result; } diff --git a/src/com/platform/entities/DataInfoEntity.java b/src/com/platform/entities/DataInfoEntity.java index b8fe02a5..d0008363 100644 --- a/src/com/platform/entities/DataInfoEntity.java +++ b/src/com/platform/entities/DataInfoEntity.java @@ -57,6 +57,12 @@ public class DataInfoEntity { /** 是否进行了校验 */ private String checkoutFlag; + /** 起始月份 */ + private String startMonth; + + /** 结束月份 */ + private String endMonth; + /** 是否进行了抽取 */ private String standardExtractStatus; @@ -402,6 +408,34 @@ public class DataInfoEntity { this.standardExtractStatus = standardExtractStatus; } + /** + * @return the startMonth + */ + public String getStartMonth() { + return startMonth; + } + + /** + * @param startMonth the startMonth to set + */ + public void setStartMonth(String startMonth) { + this.startMonth = startMonth; + } + + /** + * @return the endMonth + */ + public String getEndMonth() { + return endMonth; + } + + /** + * @param endMonth the endMonth to set + */ + public void setEndMonth(String endMonth) { + this.endMonth = endMonth; + } + @Override public String toString() { return "id=" + this.id + " ,regionalismCode=" + this.regionalismCode diff --git a/src/com/platform/entities/VolumeEntity.java b/src/com/platform/entities/VolumeDataEntity.java similarity index 88% rename from src/com/platform/entities/VolumeEntity.java rename to src/com/platform/entities/VolumeDataEntity.java index 2bac8a04..994c490a 100644 --- a/src/com/platform/entities/VolumeEntity.java +++ b/src/com/platform/entities/VolumeDataEntity.java @@ -22,7 +22,7 @@ import java.util.List; * @since [产品/模块版本] */ -public class VolumeEntity { +public class VolumeDataEntity { /** volume总大小 */ private Double allSize; @@ -43,6 +43,7 @@ public class VolumeEntity { /** volume树形目录 */ private List folder = new ArrayList(); +// private FolderNode folder = new FolderNode(); /** volume的 块 */ private List brick = new ArrayList(); @@ -146,6 +147,13 @@ public class VolumeEntity { this.folder = folder; } + /** + * @return the status + */ + public Boolean getStatus() { + return status; + } + /** * @return the brick */ diff --git a/src/com/platform/http/HttpClientConstant.java b/src/com/platform/http/HttpClientConstant.java new file mode 100644 index 00000000..36a887e0 --- /dev/null +++ b/src/com/platform/http/HttpClientConstant.java @@ -0,0 +1,14 @@ +package com.platform.http; + +/** http请求常量 + * @author chen + * + */ +public class HttpClientConstant { + + /** + * gfs的 web 服务的 IP、端口 + */ + public static String URL_IP_PORT = "http://192.168.0.110:9001/"; + +} diff --git a/src/com/platform/http/HttpUtils.java b/src/com/platform/http/HttpUtils.java new file mode 100644 index 00000000..9e05dafb --- /dev/null +++ b/src/com/platform/http/HttpUtils.java @@ -0,0 +1,214 @@ +package com.platform.http; + +import java.beans.IntrospectionException; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.HttpClient; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.util.EntityUtils; +import org.apache.log4j.Logger; +import org.springframework.http.HttpStatus; + +import com.fasterxml.jackson.core.JsonGenerationException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.platform.utils.Bean2MapUtils; + +/** http请求客户端 + * @author chen + * + */ +public class HttpUtils { + + private static ObjectMapper mapper = new ObjectMapper(); + /** + * 日志 + */ + public final static Logger log = Logger.getLogger(HttpUtils.class); + + /** post请求前 对象 转成 json + * @param subUrl + * @param data + * @return + * @throws IOException + * @throws JsonMappingException + * @throws JsonGenerationException + */ + public String sendAjaxPost(String subUrl, Object data) throws JsonGenerationException, JsonMappingException, IOException { + String jsondata = null; + //转成json + if (null != data) { + Writer strWriter = new StringWriter(); + mapper.writeValue(strWriter, data); + jsondata = strWriter.toString(); + } + return sendAjaxPost(subUrl, jsondata); + } + + /** 发post请求 + * @param subUrl + * @param map + * @return + */ + public String sendAjaxPost(String subUrl, String json) { + String resultStr = ""; + HttpClient client = new DefaultHttpClient(); + + HttpPost post = new HttpPost(HttpClientConstant.URL_IP_PORT + subUrl); + try { + // 传参 + if (null != json && !"".equals(json)) { + // 建立一个NameValuePair数组，用于存储欲传送的参数 + StringEntity entity = new StringEntity(json,"UTF-8"); + entity.setContentEncoding("UTF-8"); + entity.setContentType("application/json"); + + post.setEntity(entity); + } + // 发送 + HttpResponse respone = client.execute(post); + //接收返回值 + if(respone.getStatusLine().getStatusCode() == HttpStatus.OK.value()){ + HttpEntity result = respone.getEntity(); + if (null != result) { + resultStr = EntityUtils.toString(result); + } + } + } catch (Exception e) { + log.info(HttpClientConstant.URL_IP_PORT + subUrl); + log.error(e); + } + return resultStr; + } + + /** post请求前 对象 转成 map + * @param subUrl + * @param data + * @return + */ + public String sendPost(String subUrl, Object data) { + Map map = null; + if (null != data) { + //转成json + try { + map = Bean2MapUtils.convertBean(data); + } catch (IllegalAccessException e) { + log.error(e); + } catch (InvocationTargetException e) { + log.error(e); + } catch (IntrospectionException e) { + log.error(e); + } + } + return sendPost(subUrl, map); + } + + /** 普通map 发送 + * @param subUrl + * @param map + * @return + */ + public String sendPost(String subUrl, Map map) { + String resultStr = ""; + HttpClient client = new DefaultHttpClient(); + + HttpPost post = new HttpPost(HttpClientConstant.URL_IP_PORT + subUrl); + try { + // 传参 + List parameters = new ArrayList(); + if (null != map) { + // 封装数据 + for (String key : map.keySet()) { + String value = ""; + Object obj = map.get(key); + String type = obj.getClass().getName(); + //字符串 + if (type.equals("java.lang.String")) { + value = (String) obj; + } + //数组 + else if(type.contains("[L")){ + JSONArray jsonarr = JSONArray.fromObject(obj); + value = jsonarr.toString(); + } + //集合 + else if(type.contains("java.util.")){ + JSONArray jsonarr = JSONArray.fromObject(obj); + value = jsonarr.toString(); + } + //除字符外的 其他 基本类型 + else if(type.contains("java.lang.")){ + value = String.valueOf(obj); + } + //对象 + else { + JSONObject jsondata = JSONObject.fromObject(obj); + value = jsondata.toString(); + } + parameters.add(new BasicNameValuePair(key, value)); + } + // 传参 放入 url的 form中 + UrlEncodedFormEntity entity = new UrlEncodedFormEntity(parameters, + "UTF-8"); + post.setEntity(entity); + } + + // 发送 + HttpResponse respone = client.execute(post); + HttpEntity result = respone.getEntity(); + if (null != result) { + resultStr = EntityUtils.toString(result); + } + } catch (Exception e) { + log.info(HttpClientConstant.URL_IP_PORT + subUrl); + log.error(e); + } + return resultStr; + } + +// public static void main(String[] args) { +// HttpUtils ht = new HttpUtils(); +// Volume v = new Volume("a", 200, 10, null, null); +// String rest = ht.sendPost("data/getOperateTasks", v); +// System.out.println(rest); +// Map m = new HashMap(); +// m.put("a", 1); +// rest = ht.sendPost("data/getOperateTasks", m); +// System.out.println(rest); +// rest = ht.sendPost("data/getOperateTasks", null); +// System.out.println(rest); +// // +// String[] str = new String[2]; +// str[1] = "1"; +// str[0] = "0"; +// m.put("arr", str); +// +// Volume[] vli = new Volume[2]; +// vli[1] = new Volume("a", 200, 10, null, null); +// vli[0] = new Volume("a", 200, 10, null, null); +// m.put("vli", vli); +// List num = new ArrayList(); +// num.add(2); +// m.put("num", num); +// m.put("bool", true); +// rest = ht.sendPost("data/getOperateTasks", m); +// System.out.println(rest); +// } + +} diff --git a/src/com/platform/http/VolumeEntity.java b/src/com/platform/http/VolumeEntity.java new file mode 100644 index 00000000..31890e9f --- /dev/null +++ b/src/com/platform/http/VolumeEntity.java @@ -0,0 +1,167 @@ + +/** + * 文件名 : VolumeEntity.java + * 版权 : <版权/公司名> + * 描述 : <描述> + * @author chen + * 版本 : <版本> + * 修改时间： 2016年9月9日 + * 修改内容： <修改内容> + */ +package com.platform.http; + +import java.util.ArrayList; +import java.util.List; + +import com.platform.entities.Brick; +import com.platform.entities.FolderNode; + +/** + * gfs的 volume 对象 + * + * @author chen + * @version [版本号，2016年9月9日] + * @see [相关类/方法] + * @since [产品/模块版本] + */ + +public class VolumeEntity { + + /** volume总大小 */ + private double allSize; + + /** volume已使用大小 */ + private double usedSize; + + /** volume名称 */ + private String name; + + /** 挂载点 */ + private String path; + + /** * exist，正常返回状态Started,Stopped,Created */ + private String status; + + private String type; + + /** volume数据的树形目录 */ + private FolderNode folder = new FolderNode(); + + /** volume的 块 */ + private List brick = new ArrayList(); + + /** + * @return the allSize + */ + public double getAllSize() { + return allSize; + } + + /** + * @param allSize the allSize to set + */ + public void setAllSize(double allSize) { + this.allSize = allSize; + } + + /** + * @return the usedSize + */ + public double getUsedSize() { + return usedSize; + } + + /** + * @param usedSize the usedSize to set + */ + public void setUsedSize(double usedSize) { + this.usedSize = usedSize; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the path + */ + public String getPath() { + return path; + } + + /** + * @param path the path to set + */ + public void setPath(String path) { + this.path = path; + } + + + /** + * @return the status + */ + public String getStatus() { + return status; + } + + /** + * @param status the status to set + */ + public void setStatus(String status) { + this.status = status; + } + + /** + * @return the type + */ + public String getType() { + return type; + } + + /** + * @param type the type to set + */ + public void setType(String type) { + this.type = type; + } + + /** + * @return the folder + */ + public FolderNode getFolder() { + return folder; + } + + /** + * @param folder the folder to set + */ + public void setFolder(FolderNode folder) { + this.folder = folder; + } + + /** + * @return the brick + */ + public List getBrick() { + return brick; + } + + /** + * @param brick the brick to set + */ + public void setBrick(List brick) { + this.brick = brick; + } + + +} diff --git a/src/com/platform/http/gfs/CopyData.java b/src/com/platform/http/gfs/CopyData.java new file mode 100644 index 00000000..1412d15d --- /dev/null +++ b/src/com/platform/http/gfs/CopyData.java @@ -0,0 +1,131 @@ +package com.platform.http.gfs; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + + +import net.sf.json.JSONArray; + +import org.apache.log4j.Logger; + +import com.base.MyException; +import com.base.PostData; +import com.base.TaskOperateData; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.platform.http.HttpUtils; +import com.platform.http.VolumeEntity; +import com.platform.utils.DateForm; + + +/** + * <一句话功能简述> 复制数据 + * <功能详细描述> + * @author chen + * @version [版本号，2016年9月8日] + * @see [相关类/方法] + * @since [产品/模块版本] + */ + +public class CopyData { + public static Logger log = Logger.getLogger(CopyData.class); + HttpUtils ht = new HttpUtils(); + + /** + * 将sourceFolderName拷贝到destFolderName + * 如果拷贝正常返回1，如果sourceFolderName不存在返回-2 ，如果destFolderName不存在返回-3 + * @param sourceFolderName + * @param destFolderName + * @return + * @see [类、类#方法、类#成员] + */ + public int copyFolder(String sourceFolderName, String destFolderName) throws Exception{ + int reslut = 0; + log.info(" copyFolder " + sourceFolderName + " --> " + destFolderName); + + Map map = new HashMap(); + map.put("sourcePath", sourceFolderName); + map.put("destPath", destFolderName); + //请求web + String rest = ht.sendPost("data/copyData", map); + if (null == rest || "".equals(rest)) { + log.error(" --- gluster is disconnect ! \n"); + return 0; + } + Gson gs = new Gson(); + PostData data = gs.fromJson(rest, PostData.class); + // 1 : 成功 + double copyResult = (double) data.getData(); + reslut = (int) copyResult; + getExcept(data); + return reslut; + } + + + /** + * 将sourceFolderName拷贝到destFolderName + * 如果拷贝正常返回1，如果sourceFolderName不存在返回-2 ，如果destFolderName不存在返回-3 + * @param sourceFolderName + * @param destFolderName + * @return + * @see [类、类#方法、类#成员] + */ + public List operationTask() throws Exception{ + List li = new ArrayList(); + Map map = new HashMap(); + Calendar c2 = Calendar.getInstance(); + map.put("endTime", DateForm.date2StringBysecond(c2.getTime())); + // 时间设置为 10天 前的时间 + c2.set(Calendar.DAY_OF_YEAR, c2.get(Calendar.DAY_OF_YEAR) -10); + String time = DateForm.date2StringBysecond(c2.getTime()); + map.put("startTime", time); + List typeList = new ArrayList(); + typeList.add(0); + typeList.add(1); + typeList.add(2); + typeList.add(3); + typeList.add(-1); + typeList.add(-2); + map.put("statusList", typeList); + + //请求web + String rest = ht.sendPost("data/getOperateTasks", map); + if (null == rest || "".equals(rest)) { + log.error(" --- gluster is disconnect ! \n"); + return li; + } + Gson gs = new Gson(); + PostData data = gs.fromJson(rest, (new PostData(new ArrayList()).getClass())); + li = (List) data.getData(); + //解析 PostData + if(li.size() > 0){ + JSONArray jsonarr = JSONArray.fromObject(data.getData()); + try { + li = gs.fromJson(jsonarr.toString(), new TypeToken>(){}.getType()); + } catch (Exception e) { + log.error(e); + } + } + getExcept(data); + return li; + } + + /** 记录异常信息 + * @param pd + */ + private void getExcept(PostData pd) { + StringBuffer sb = new StringBuffer(); + for ( MyException object : pd.getExceptionsStack()) { + sb.append(object.getMess()).append(","); + } + if (!"".equals(sb.toString())) { + log.error(sb.toString()); + } + } +} + + diff --git a/src/com/platform/http/gfs/HttpClientConstant.java b/src/com/platform/http/gfs/HttpClientConstant.java deleted file mode 100644 index d5f9cfd4..00000000 --- a/src/com/platform/http/gfs/HttpClientConstant.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.platform.http.gfs; - -public class HttpClientConstant { - - public static String URL_IP_PORT = "http://192.168.0.110:8088/jfinal/"; - -} diff --git a/src/com/platform/http/gfs/HttpUtils.java b/src/com/platform/http/gfs/HttpUtils.java deleted file mode 100644 index 149c1091..00000000 --- a/src/com/platform/http/gfs/HttpUtils.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.platform.http.gfs; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import net.sf.json.JSONObject; - -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.NameValuePair; -import org.apache.http.client.HttpClient; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -import org.apache.log4j.Logger; - -import com.platform.controller.DataModelController; -import com.platform.utils.Bean2MapUtils; -import com.platform.utils.Configs; - -public class HttpUtils { - - public static Logger log = Configs.DAILY_ROLLING_LOGGER.getLogger(HttpUtils.class); - - public String sendPost(String subUrl, Object data) { - String resultStr = ""; - HttpClient client = new DefaultHttpClient(); - HttpPost post = new HttpPost(HttpClientConstant.URL_IP_PORT + subUrl); - try { - // 传参 - List parameters = new ArrayList(); - - if (null != data) { - // 转 map - Map map = Bean2MapUtils.convertBean(data); - // 转json - JSONObject jsondata = JSONObject.fromObject(map); - // 封装数据 - parameters.add(new BasicNameValuePair("jsondata", jsondata - .toString())); - parameters.add(new BasicNameValuePair("type", data.getClass() - .getName())); - // 传参 放入 url的 form中 - UrlEncodedFormEntity entity = new UrlEncodedFormEntity(parameters, - "UTF-8"); - post.setEntity(entity); - } - - // 发送 - HttpResponse respone = client.execute(post); - HttpEntity result = respone.getEntity(); - if (null != result) { - resultStr = EntityUtils.toString(result); - } -// resultMap = Bean2MapUtils.convertBean(result); - } catch (Exception e) { - System.out.println(e); - } - return resultStr; - } - -// public static void main(String[] args) { -// Date d = new Date(); -// HttpUtils ht = new HttpUtils(); -// BaseForm1 bas = new BaseForm1(); -// bas.setId("12"); -// bas.setName("n12"); -// String rest = ht.sendPost("gfs/getAllvolume", null); -// if (null != rest) { -// System.out.println(rest); -// JSONArray jsondata = JSONArray.fromObject(rest); -// ArrayList fo = (ArrayList) JSONArray.toCollection(jsondata, VolumeEntity.class); -// System.err.println(fo); -// try { -// System.err.println(Bean2MapUtils.convertBean(fo)); -// } catch (IllegalAccessException | InvocationTargetException -// | IntrospectionException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } -// } -// -// Date r = new Date(); -// System.err.println(r.getTime() - d.getTime()); -// } - -} diff --git a/src/com/platform/http/gfs/RemoveData.java b/src/com/platform/http/gfs/RemoveData.java new file mode 100644 index 00000000..ffcd0422 --- /dev/null +++ b/src/com/platform/http/gfs/RemoveData.java @@ -0,0 +1,84 @@ +package com.platform.http.gfs; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.log4j.Logger; + +import com.base.MyException; +import com.base.PostData; +import com.google.gson.Gson; +import com.platform.http.HttpUtils; + +/** 迁移数据 + * @author chen + * + */ +public class RemoveData { + + public static Logger log = Logger.getLogger ( RemoveData.class); + HttpUtils ht = new HttpUtils(); + + /** + * -1 :error; 0: the filename is not exists ; 1: right + * @param folderName + * @param fileName + * @return + */ + public int deleteFolder(String folderName) throws Exception{ + int reslut = 0; + log.info("start delete "+folderName); + + Map map = new HashMap(); + map.put("removePath", folderName); + //请求 web sendPost + String rest = ht.sendPost("data/removeData", map); + if (null == rest || "".equals(rest)) { + log.error(" --- gluster is disconnect ! \n"); + return 0; + } + Gson gs = new Gson(); + PostData data = gs.fromJson(rest, PostData.class); + // 1 : 成功 + double copyResult = (double) data.getData(); + reslut = (int) copyResult; + getExcept(data); + return reslut; + } + + public int abortcopyFolder(String sourceFolderName, String destFolderName) throws Exception{ + int reslut = 0; + log.info(" abortcopyFolder " + sourceFolderName + " --> " + destFolderName); + + Map map = new HashMap(); + map.put("sourcePath", sourceFolderName); + map.put("destPath", destFolderName); + //请求web + String rest = ht.sendPost("data/abortCopyData", map); + if (null == rest || "".equals(rest)) { + log.error(" --- gluster is disconnect ! \n"); + return 0; + } + Gson gs = new Gson(); + PostData data = gs.fromJson(rest, PostData.class); + // 1 : 成功 + double copyResult = (double) data.getData(); + reslut = (int) copyResult; + getExcept(data); + return reslut; + } + + /** 记录异常信息 + * @param pd + */ + private void getExcept(PostData pd) { + StringBuffer sb = new StringBuffer(); + for ( MyException object : pd.getExceptionsStack()) { + sb.append(object.getMess()).append(","); + } + if (!"".equals(sb.toString())) { + log.error(sb.toString()); + } + } + +} diff --git a/src/com/platform/http/gfs/SetVolume.java b/src/com/platform/http/gfs/SetVolume.java new file mode 100644 index 00000000..19d0e70b --- /dev/null +++ b/src/com/platform/http/gfs/SetVolume.java @@ -0,0 +1,320 @@ +/** + * @author 李乾坤 + * 进行volume的一系列操作，如创建、开启停止volume，为volume添加或删除brick + */ +package com.platform.http.gfs; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.sf.json.JSONArray; + +import org.apache.log4j.Logger; + +import com.base.MyException; +import com.base.PostData; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.platform.entities.FolderNode; +import com.platform.entities.VolumeDataEntity; +import com.platform.http.HttpUtils; +import com.platform.http.VolumeEntity; +import com.platform.utils.BeanCopy; + +public class SetVolume { + public static Logger log = Logger.getLogger(SetVolume.class); + HttpUtils ht = new HttpUtils(); + + /** 查询volume信息（包括其下目录） + * @return json字符串 + */ + public String getAllvolume() { + List datas = new ArrayList(); + try { + datas = getAllvolumeEntity(); + } catch (Exception e) { + log.error(e); + } + if (datas.size() == 0) { + return ""; + } + JSONArray jsonarr = JSONArray.fromObject(datas); + return jsonarr.toString(); + } + + /** 查询volume信息（包括其下目录） + * @return json字符串 + */ + public List getAllvolumeEntity() throws Exception{ + List volumeList = new ArrayList(); + String rest = ht.sendPost("gfs/getAllVolume", null); + if (null == rest || "".equals(rest)) { + log.error(" --- gluster is disconnect ! \n"); + return volumeList; + } +// JSONObject json = JSONObject.fromObject(rest); + + Gson gs = new Gson(); + PostData data = gs.fromJson(rest, (new PostData(new ArrayList())).getClass()); + List volumes = (List) data.getData(); + if(null == volumes){ + log.error("-----gfs/getAllVolume----- no volume ----"); + getExcept(data); + return volumeList; + } + //解析 PostData + if(volumes.size() > 0){ + JSONArray jsonarr = JSONArray.fromObject(data.getData()); + try { + volumes = gs.fromJson(jsonarr.toString(), new TypeToken>(){}.getType()); + } catch (Exception e) { + log.error(e); + } + } + for (VolumeEntity volumeEntity : volumes) { + VolumeDataEntity entity = new VolumeDataEntity(); + BeanCopy.copyBean(volumeEntity, entity, "folder", "status"); + if (null != volumeEntity.getFolder()) { + List fn = new ArrayList(); + fn.add(volumeEntity.getFolder()); + entity.setFolder(fn); + if ("Started".equals(volumeEntity.getStatus())) { + entity.setStatus(true); + } + } + volumeList.add(entity); + } + getExcept(data); + return volumeList; + } + + /** + * 创建volume 返回值：创建并挂载成功 1 1:可以创建 ;-1：brick的ip不在集群中或者未连接; -2 -3 + * -4:类型与brick数目不匹配 ; -5 :volumeName 已经存在；-6：挂载点存在且不为空，不能作为挂载点； -7：未知错误 + * + * @param volumeName + * @param count + * @param type + * @param bricks + * @param mountPoint + * @return + * @see [类、类#方法、类#成员] + */ + public int createVolume(String volumeName, int count, String type, List bricks, String mountPoint) throws Exception{ + int reslut = 0; + log.info("Creat new volume " + volumeName); + Map map = new HashMap(); + map.put("volumeName", volumeName); + map.put("count", count); + map.put("type", type); + map.put("bricks", bricks); + map.put("mountPoint", mountPoint); + //请求 gfs 的 web + String rest = ht.sendPost("gfs/createVolume", map); + if (null == rest || "".equals(rest)) { + log.error(" --- gluster is disconnect ! \n"); + return 0; + } + Gson gs = new Gson(); + PostData data = gs.fromJson(rest, PostData.class); + + // 1 : 成功 + double copyResult = (double) data.getData(); + reslut = (int) copyResult; + getExcept(data); + return reslut; + } + + /** + * 删除volume 1 表示成功 ；-1表示volume name不存在；-2表示停止volume 失败； + * -3表示删除失败，-4表示/gfsAutoMount/mountPoint.record文件不存在 + * @param volumeName + * @return + * @see [类、类#方法、类#成员] + */ + public int deleteVolume(String volumeName) throws Exception{ + int reslut = 0; + log.info("delete volume " + volumeName); + Map map = new HashMap(); + map.put("volumeName", volumeName); + //请求web + String rest = ht.sendPost("gfs/deleteVolume", map); + if (null == rest || "".equals(rest)) { + log.error(" --- gluster is disconnect ! \n"); + return 0; + } + Gson gs = new Gson(); + PostData data = gs.fromJson(rest, PostData.class); + // 1 : 成功 + double copyResult = (double) data.getData(); + reslut = (int) copyResult; + getExcept(data); + return reslut; + } + + /** + * 为指定的volume添加brick,参数中需要指定类型、数量等 返回值：1成功 ;其他失败 + * 过程中需要先检查volume是否存在，还需检查给出的brick数量与类型、count是否相符 + * + * @param volumeName + * @param brickName + * @param count + * @param type + * @return + * @see [类、类#方法、类#成员] + */ + public int addBrickVolume(String volumeName, List brickName, int count, String type) throws Exception{ + int reslut = 0; + StringBuffer sb = new StringBuffer(); + for (String string : brickName) { + sb.append(string).append(","); + } + log.info("addBrick Volume " + volumeName+" Brick "+ sb.toString()); + Map map = new HashMap(); + map.put("volumeName", volumeName); + map.put("bricks", brickName); + //请求web + String rest = ht.sendPost("gfs/addABricks", map); + if (null == rest || "".equals(rest)) { + log.error(" --- gluster is disconnect ! \n"); + return 0; + } + Gson gs = new Gson(); + PostData data = gs.fromJson(rest, PostData.class); + // 1 : 成功 + double copyResult = (double) data.getData(); + reslut = (int) copyResult; + getExcept(data); + return reslut; + } + + /** + * 为指定的volume删除brick,参数中需要指定类型、数量等 返回值：1 成功 ;其他 失败 + * 过程中需要先检查volume是否存在，还需检查给出的brick数量与类型、count是否相符 + * + * @param volumeName + * @param brickName + * @param count + * @param type + * @return + * @see [类、类#方法、类#成员] + */ + public int deleteBrickVolume(String volumeName, List brickName, int count, String type) throws Exception { + int reslut = 0; + StringBuffer sb = new StringBuffer(); + for (String string : brickName) { + sb.append(string).append(","); + } + log.info("deleteBrick Volume " + volumeName+" Brick "+ sb.toString()); + Map map = new HashMap(); + map.put("volumeName", volumeName); + map.put("bricks", brickName); + //请求web + String rest = ht.sendPost("gfs/deleteBrickForce", map); + if (null == rest || "".equals(rest)) { + log.error(" --- gluster is disconnect ! \n"); + return 0; + } + Gson gs = new Gson(); + PostData data = gs.fromJson(rest, PostData.class); + // 1 : 成功 + double copyResult = (double) data.getData(); + reslut = (int) copyResult; + getExcept(data); + return reslut; + } + + /* + * 停止指定volume 参数中需给出volume的名字 返回值： 0 成功 -1 失败 + * 需要先检查volume是否存在，然后判断volume的状态是否已经是停止状态 + */ + public int stopVolume(String volumeName) throws Exception{ + int reslut = 0; + log.info("stop volume " + volumeName); + Map map = new HashMap(); + map.put("volumeName", volumeName); + //请求web + String rest = ht.sendPost("gfs/stopVolume", map); + if (null == rest || "".equals(rest)) { + log.error(" --- gluster is disconnect ! \n"); + return 0; + } + Gson gs = new Gson(); + PostData data = gs.fromJson(rest, PostData.class); + // 1 : 成功 + double copyResult = (double) data.getData(); + reslut = (int) copyResult; + getExcept(data); + return reslut; + } + + /* + * 开启指定volume 参数中需给出volume的名字 返回值： 0 成功 -1 失败 + * 需要先检查volume是否存在，然后判断volume的状态是否已经是开启状态 + */ + public int startVolume(String volumeName) throws Exception { + int reslut = 0; + log.info("start volume " + volumeName); + Map map = new HashMap(); + map.put("volumeName", volumeName); + //请求web + String rest = ht.sendPost("gfs/startVolume", map); + if (null == rest || "".equals(rest)) { + log.error(" --- gluster is disconnect ! \n"); + return 0; + } + Gson gs = new Gson(); + PostData data = gs.fromJson(rest, PostData.class); + // 1 : 成功 + double copyResult = (double) data.getData(); + reslut = (int) copyResult; + getExcept(data); + return reslut; + } + + /** 记录异常信息 + * @param pd + */ + private void getExcept(PostData pd) { + StringBuffer sb = new StringBuffer(); + for ( MyException object : pd.getExceptionsStack()) { + sb.append(object.getMess()).append(","); + } + if (!"".equals(sb.toString())) { + log.error(sb.toString()); + } + } + +// /** json 转 对象 +// * @param folds +// * @return +// */ +// private List setChildFolders(List folds) { +// List folders = null; +// if (null != folds) { +// JSONArray foldJson = JSONArray.fromObject(folds); +// folders = (List)JSONArray.toCollection(foldJson, FolderNode.class); +// for (FolderNode folderNode : folders) { +// List childFolds = folderNode.getChildNodes(); +// //递归 +// folderNode.setChildNodes(setChildFolders(childFolds)); +// } +// } +// return folders; +// } +// +// /** json 转 对象 +// * @param bricks +// * @return +// */ +// private List setBricks(List bricks) { +// List bs = null; +// if (null != bricks) { +// JSONArray bsJson = JSONArray.fromObject(bricks); +// bs = (List)JSONArray.toCollection(bsJson, Brick.class); +// } +// return bs; +// } +} diff --git a/src/com/platform/oracle/OracleConnector.java b/src/com/platform/oracle/OracleConnector.java index 4a25e5f4..e3bc021f 100644 --- a/src/com/platform/oracle/OracleConnector.java +++ b/src/com/platform/oracle/OracleConnector.java @@ -113,10 +113,9 @@ public class OracleConnector { Statement statement = null; try { statement = conn.createStatement(); - statement.execute(sql); - flag = true; + flag =statement.execute(sql); FileOperateHelper - .fileWrite(filePath+".log", sql+ "\r\n"+"OK \r\n"); + .fileWrite(filePath+".log", sql+ "\r\n"+ flag +" \r\n"); } catch (SQLException e) { flag = false; FileOperateHelper diff --git a/src/com/platform/service/ICodeService.java b/src/com/platform/service/ICodeService.java index 9e4d5fdb..570b3996 100644 --- a/src/com/platform/service/ICodeService.java +++ b/src/com/platform/service/ICodeService.java @@ -17,7 +17,7 @@ import java.util.Map; import com.platform.entities.FolderNode; import com.platform.entities.RegionalismEntity; import com.platform.entities.SystemEntity; -import com.platform.entities.VolumeEntity; +import com.platform.entities.VolumeDataEntity; /** diff --git a/src/com/platform/service/IGfsService.java b/src/com/platform/service/IGfsService.java index e3f05ade..867f7f21 100644 --- a/src/com/platform/service/IGfsService.java +++ b/src/com/platform/service/IGfsService.java @@ -11,7 +11,7 @@ package com.platform.service; import java.util.List; import com.platform.entities.FolderNode; -import com.platform.entities.VolumeEntity; +import com.platform.entities.VolumeDataEntity; /** * <一句话功能简述> @@ -44,7 +44,7 @@ public interface IGfsService { * @see [类、类#方法、类#成员] */ - public int copyFolder(List srcFolders, String dstFolder, String name) throws Exception; +// public int copyFolder(List srcFolders, String dstFolder, String name) throws Exception; /** * <一句话功能简述> 获得volume下的 name \ allsize \ usedsize \ folderTree \ brick @@ -53,7 +53,7 @@ public interface IGfsService { * @throws Exception * @see [类、类#方法、类#成员] */ - public List getAllVolumes() throws Exception; + public List getAllVolumes() throws Exception; /** * <一句话功能简述> 根据volume名称获取 volume @@ -62,7 +62,7 @@ public interface IGfsService { * @throws Exception * @see [类、类#方法、类#成员] */ - public VolumeEntity getOneVolume(String volumeName) throws Exception; + public VolumeDataEntity getOneVolume(String volumeName) throws Exception; /** 移动数据 * @param volumeName @@ -71,7 +71,7 @@ public interface IGfsService { * @return * @throws Exception */ - public int moveData(String volumeName, String srcPath, String dstPath) throws Exception; +// public int moveData(String volumeName, String srcPath, String dstPath) throws Exception; /** 删除数据 * @param volumeName diff --git a/src/com/platform/service/IVolumeService.java b/src/com/platform/service/IVolumeService.java index d4370058..a6687fa9 100644 --- a/src/com/platform/service/IVolumeService.java +++ b/src/com/platform/service/IVolumeService.java @@ -1,35 +1,41 @@ package com.platform.service; -import com.platform.entities.VolumeEntity; +import com.platform.entities.VolumeDataEntity; public interface IVolumeService { + /** 查询所有 volume 包括 其目录（返回字符串） + * @return + * @throws Exception + */ + public String getAllvolume() throws Exception; + /** 新增 volume * @param entity * @return * @throws Exception */ - public int save(VolumeEntity entity) throws Exception; + public int save(VolumeDataEntity entity) throws Exception; /** 删除 volume * @param entity * @return * @throws Exception */ - public int delete(VolumeEntity entity) throws Exception; + public int delete(VolumeDataEntity entity) throws Exception; /** 启动volume * @param entity * @return * @throws Exception */ - public int start(VolumeEntity entity) throws Exception; + public int start(VolumeDataEntity entity) throws Exception; /** 停止 volume * @param entity * @return * @throws Exception */ - public int stop(VolumeEntity entity) throws Exception; + public int stop(VolumeDataEntity entity) throws Exception; } diff --git a/src/com/platform/service/OracleExtractHelper.java b/src/com/platform/service/OracleExtractHelper.java index fb4f272a..5f6a215a 100644 --- a/src/com/platform/service/OracleExtractHelper.java +++ b/src/com/platform/service/OracleExtractHelper.java @@ -71,7 +71,9 @@ public class OracleExtractHelper { + linkName; //删除 dblink if (OracleConnector.execOracleSQL(conn, deleteSql, Configs.EXTRACT_LOG_LOCALTION + oc.getName())) { - OracleConnector.execOracleSQL(conn, sql, Configs.EXTRACT_LOG_LOCALTION + oc.getName()); + if(!OracleConnector.execOracleSQL(conn, sql, Configs.EXTRACT_LOG_LOCALTION + oc.getName())){ + OracleConnector.execUpdateOracleSQL(conn, sql, Configs.EXTRACT_LOG_LOCALTION + oc.getName()); + } } else { Configs.CONSOLE_LOGGER.error("删除已有的DBLink失败,无法创建新的DBLink!"); FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION @@ -80,7 +82,9 @@ public class OracleExtractHelper { } else { // 否则，创建dblink - OracleConnector.execOracleSQL(conn, sql, Configs.EXTRACT_LOG_LOCALTION + oc.getName()); + if(!OracleConnector.execOracleSQL(conn, sql, Configs.EXTRACT_LOG_LOCALTION + oc.getName())){ + OracleConnector.execUpdateOracleSQL(conn, sql, Configs.EXTRACT_LOG_LOCALTION + oc.getName()); + } } } } diff --git a/src/com/platform/service/impl/DataInfoServiceImp.java b/src/com/platform/service/impl/DataInfoServiceImp.java index 5c14cf45..8c97ccf0 100644 --- a/src/com/platform/service/impl/DataInfoServiceImp.java +++ b/src/com/platform/service/impl/DataInfoServiceImp.java @@ -17,7 +17,7 @@ import com.base.CustomException; import com.platform.dao.DataInfoDao; import com.platform.entities.DataInfoEntity; import com.platform.form.PagerOptions; -import com.platform.glusterfs.RemoveData; +import com.platform.http.gfs.RemoveData; import com.platform.service.DataInfoService; import com.platform.utils.Configs; @@ -47,7 +47,7 @@ public class DataInfoServiceImp implements DataInfoService { List list = new ArrayList(); //如果有查询数据库类型的 //去掉版本字段 - Pattern pattern = Pattern.compile("^版本\\d+$"); + Pattern pattern = Pattern.compile("^版本\\d+"); if (null != querystr && !"".equals(querystr)) { if (querystr.toLowerCase().contains("oracle")) { pagerOptions.setDataBaseType("ORACLE"); diff --git a/src/com/platform/service/impl/GfsServiceImpl.java b/src/com/platform/service/impl/GfsServiceImpl.java index 670d756a..12f3a384 100644 --- a/src/com/platform/service/impl/GfsServiceImpl.java +++ b/src/com/platform/service/impl/GfsServiceImpl.java @@ -18,8 +18,8 @@ import org.springframework.stereotype.Service; import com.platform.entities.Brick; import com.platform.entities.FolderNode; -import com.platform.entities.VolumeEntity; -import com.platform.glusterfs.CopyData; +import com.platform.entities.VolumeDataEntity; +import com.platform.http.gfs.CopyData; import com.platform.glusterfs.GetTreeData; import com.platform.glusterfs.VolumeInfo; import com.platform.service.IGfsService; @@ -53,104 +53,48 @@ public class GfsServiceImpl implements IGfsService { return result; } - @Override - public int copyFolder(List srcFolders, String dstFolder, String name) - throws Exception { - int status = 0 ; - if (null != srcFolders) { - - for (String string : srcFolders) { - status = copydata.copyFolderFilesAnyway(string, dstFolder, name); - } - } - return status; - } +// @Override +// public int copyFolder(List srcFolders, String dstFolder, String name) +// throws Exception { +// int status = 0 ; +// if (null != srcFolders) { +// +// for (String string : srcFolders) { +//// status = copydata.copyFolderFilesAnyway(string, dstFolder, name); +// } +// } +// return status; +// } /* (non-Javadoc) * @see com.platform.service.IGfsService#getAllVolume() */ @Override - public List getAllVolumes() throws Exception { - List volumeList = CacheTreeData.getVolumeList(); - if (null == volumeList) { - return new ArrayList(); - } - for (VolumeEntity volume : volumeList) { -// VolumeEntity volume = new VolumeEntity(); -// volume.setName(volumeName); -// List path = volumeInfo.getVolumeMountPoint(volumeName); -// //默认加载第一个路径 -// if (null != path && path.size() > 0) { -// volume.setPath(path.get(0)); -// } -// volume.setAllSize(volumeInfo.getVolumeAllSize(volumeName)); -// volume.setUsedSize(volumeInfo.getVolumeUseSize(volumeName)); -// //TODO 查询brick-- -// //返回 ip:path -// List brickStrs = volumeInfo.getVolumeBricks(volumeName); -// //brick已用大小： -// Map usedSize = volumeInfo.getVolumebricksDataSize(volumeName); -// Map availableSize = volumeInfo.getVolumebricksAvailableSize(volumeName); -// -// -// List brickList = new ArrayList(); -// for (String brickIpPath : brickStrs) { -// Brick b = new Brick(); -// String ipAndpath[] = brickIpPath.split(":"); -// String brickip = ipAndpath[0]; -// String brickpath = ipAndpath[1]; -// //iP , path , -// b.setIp(brickip); -// b.setPath(brickpath); -// b.setAvailableSize(availableSize.get(brickIpPath)); -// b.setUsedSize(usedSize.get(brickIpPath)); -// brickList.add(b); -// } -// volume.setBrick(brickList); - if (null != volume.getPath()) { -// 获得 folder 目录 - List list = new ArrayList(); - FolderNode currNode = getFolder(volume.getPath()); - if (null != currNode && null != currNode.getChildNodes()) { - list.addAll(currNode.getChildNodes()); - } - volume.setFolder(list); - } - } + public List getAllVolumes() throws Exception { + List volumeList = CacheTreeData.getVolumeList(); return volumeList; } @Override - public VolumeEntity getOneVolume(String volumeName) throws Exception { - VolumeEntity volume = new VolumeEntity(); - volume.setName(volumeName); - List path = volumeInfo.getVolumeMountPoint(volumeName); - if (null != path && path.size() > 0) { - volume.setPath(path.get(0)); - } - volume.setAllSize((double) volumeInfo.getVolumeAvailableSize(volumeName)); - volume.setUsedSize((double) volumeInfo.getVolumeUseSize(volumeName)); -// volume.setBrick(brick); - if (null != volume.getPath()) { - List list = new ArrayList(); - if (null != path && path.size() > 0) { - FolderNode currNode = getFolder(path.get(0)); - if (null != currNode && null != currNode.getChildNodes()) { - list.addAll(currNode.getChildNodes()); - } + public VolumeDataEntity getOneVolume(String volumeName) throws Exception { + List volumeList = CacheTreeData.getVolumeList(); + VolumeDataEntity volume = new VolumeDataEntity(); + for (VolumeDataEntity volumeEntity : volumeList) { + if (volumeName.equals(volumeEntity.getPath())) { + volume = volumeEntity; } - volume.setFolder(list); } return volume; } - - @Override - public int moveData(String volumeName, String srcPath, String dstPath) - throws Exception { - - int result = copydata.copyFolderFilesAnyway(srcPath, dstPath, "app"); - return result; - } +// +// @Override +// public int moveData(String volumeName, String srcPath, String dstPath) +// throws Exception { +// +// int result = 0; +// result = copydata.copyFolder(srcPath, dstPath, "app"); +// return result; +// } @Override public int deleteData(String volumeName, String srcPath) throws Exception { diff --git a/src/com/platform/service/impl/MoveDataServiceImpl.java b/src/com/platform/service/impl/MoveDataServiceImpl.java index bd0facdb..9131b508 100644 --- a/src/com/platform/service/impl/MoveDataServiceImpl.java +++ b/src/com/platform/service/impl/MoveDataServiceImpl.java @@ -8,10 +8,11 @@ import java.util.regex.Pattern; import javax.annotation.Resource; -import org.springframework.scheduling.annotation.Scheduled; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; +import com.platform.controller.CheckoutController; import com.platform.dao.DataInfoDao; import com.platform.dao.DataInfoMoveTmpDao; import com.platform.dao.VolumeDao; @@ -20,17 +21,19 @@ import com.platform.entities.DataInfoEntityMoveTmp; import com.platform.entities.FolderNode; import com.platform.entities.VolumeInitEntity; import com.platform.glusterfs.CheckoutMD5; -import com.platform.glusterfs.CopyData; -import com.platform.glusterfs.RemoveData; +import com.platform.http.gfs.RemoveData; import com.platform.glusterfs.ShowData; import com.platform.service.IMoveDataService; -import com.platform.utils.Bean2MapUtils; -import com.platform.utils.Constant; import com.platform.utils.DateForm; @Component @Service(value = "moveDataService") public class MoveDataServiceImpl implements IMoveDataService { + + /** + * 日志 + */ + public final static Logger log = Logger.getLogger(CheckoutController.class); @Resource(name = "dataInfoDao") private DataInfoDao dataInfoDao; @@ -40,15 +43,10 @@ public class MoveDataServiceImpl implements IMoveDataService { private RemoveData removeservice = new RemoveData(); - /** - * 迁移 - */ - CopyData copy = new CopyData(); - /** * MD5校验 */ - CheckoutMD5 check = new CheckoutMD5(); +// CheckoutMD5 check = new CheckoutMD5(); @Resource(name = "dataInfoMoveTmpDao") private DataInfoMoveTmpDao dataInfoMoveTmpDao; @@ -148,20 +146,28 @@ public class MoveDataServiceImpl implements IMoveDataService { else { volumePath = node.getPath(); } + String path = ""; + String ip = ""; for ( VolumeInitEntity ve : listVolume) { - if (volumePath.contains(ve.getPath())) { - dataMove.setDstVolumePath(ve.getPath()); - dataMove.setDstVolumeIp(ve.getIp()); - break; + String tmpPath = ve.getPath(); + if (volumePath.contains(tmpPath)) { + if (tmpPath.length() > path.length()) { + path = tmpPath; + ip = ve.getIp(); + } } } + if (path.length() == 0) { + dataMove.setDstVolumePath("nopath"); + dataMove.setDstVolumePath("noIP"); + }else { + dataMove.setDstVolumePath(path); + dataMove.setDstVolumeIp(ip); + } moveList.add(dataMove); } if (moveList.size() > 0) { dataInfoMoveTmpDao.insertBatch(moveList); -// for (DataInfoEntityMoveTmp dataInfoEntityMoveTmp2 : moveList) { -// dataInfoMoveTmpDao.save(dataInfoEntityMoveTmp2); -// } isSuccess = true; } } @@ -172,10 +178,17 @@ public class MoveDataServiceImpl implements IMoveDataService { public List findAll() throws Exception { List result = new ArrayList(); try { - result = dataInfoMoveTmpDao.findAll(); - + List tmp = dataInfoMoveTmpDao.findAll(); + for (DataInfoEntityMoveTmp tmpentity : tmp) { + if (null != tmpentity.getSubmittedBatch() || null != tmpentity.getSystemName()) { + result.add(tmpentity); + }else { + this.delete(tmpentity); + } + } + } catch (Exception e) { - System.err.println(e); + log.error(e); } return result; } @@ -192,13 +205,18 @@ public class MoveDataServiceImpl implements IMoveDataService { } } + //迁移失败 if ("3".equals(dataMove.getCompleteStatus())) { removeservice.deleteFolder(dataMove.getDstPath()); } int result = 0; - if (!"1".equals(dataMove.getCompleteStatus())) { - result = dataInfoMoveTmpDao.remove(dataMove.getId()); + //是正则迁移时： + if ("1".equals(dataMove.getCompleteStatus())) { + if(1 != removeservice.abortcopyFolder(dataMove.getDataPath(), makeDstPath(dataMove.getDstPath()))){ + removeservice.deleteFolder(dataMove.getDstPath()); + } } + result = dataInfoMoveTmpDao.remove(dataMove.getId()); return result; } @@ -220,4 +238,19 @@ public class MoveDataServiceImpl implements IMoveDataService { return result; } + /** 去掉 最后 的 数字 +/ + * @param dstPath + * @return + */ + private String makeDstPath(String dstPath) { + // 末尾 含有 数字 + / + Pattern pattern2 = Pattern.compile("\\d+\\/$"); + Matcher matcher2 = pattern2.matcher(dstPath); + //去掉 最后 的 数字 +/ 符合 + if (matcher2.find()) { + String removeStr = matcher2.group(); + dstPath = dstPath.replace(removeStr, ""); + } + return dstPath; + } } diff --git a/src/com/platform/service/impl/OracleExtractServiceImpl.java b/src/com/platform/service/impl/OracleExtractServiceImpl.java index 6e005ed7..b34e2c56 100644 --- a/src/com/platform/service/impl/OracleExtractServiceImpl.java +++ b/src/com/platform/service/impl/OracleExtractServiceImpl.java @@ -1,6 +1,7 @@ package com.platform.service.impl; import java.sql.Connection; +import java.util.Date; import java.util.List; import javax.annotation.Resource; @@ -21,6 +22,7 @@ import com.platform.service.IOracleExtractService; import com.platform.service.OracleExtractHelper; import com.platform.utils.Configs; import com.platform.utils.Constant; +import com.platform.utils.DateForm; import com.platform.utils.FileOperateHelper; @Service(value = "OracleExtract") @@ -84,6 +86,9 @@ public class OracleExtractServiceImpl implements IOracleExtractService { for (String string : rList) sb.append(string).append("\n"); Configs.CONSOLE_LOGGER.info(sb.toString()); + //sql日志记录时间： + FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION + + collectOracle.getName()+".log", "\r\n\r\n"+ DateForm.date2StringBysecond(new Date()) +"\r\n"); // client.updateOrAddReplicasLabelById(collectOracle.getName(), "isExtract", "1"); //更新oracle汇总状态，0标示为未汇总，1标示汇总中，2标示汇总完成 oracleExtract.createDBLink(conn, collectOracle); //创建dblink oracleExtract.createTableSpace(conn, collectOracle, oracleModel); //创建表空间 @@ -162,6 +167,9 @@ public class OracleExtractServiceImpl implements IOracleExtractService { for (String string : rList) sb.append(string).append("\n"); Configs.CONSOLE_LOGGER.info(sb.toString()); + //sql日志记录时间： + FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION + + collectOracle.getName()+".log", "\r\n\r\n"+ DateForm.date2StringBysecond(new Date()) +"\r\n"); // client.updateOrAddReplicasLabelById(collectOracle.getName(), "isExtract", "1"); //更新oracle汇总状态，0标示为未汇总，1标示汇总中，2标示汇总完成 oracleExtract.createStandardDBLink(conn, collectOracle); //创建dblink oracleExtract.createTableSpace(conn, collectOracle, oracleModel); //创建表空间 diff --git a/src/com/platform/service/impl/VolumeServiceImpl.java b/src/com/platform/service/impl/VolumeServiceImpl.java index 420777c5..4083b568 100644 --- a/src/com/platform/service/impl/VolumeServiceImpl.java +++ b/src/com/platform/service/impl/VolumeServiceImpl.java @@ -11,23 +11,21 @@ import javax.annotation.Resource; import org.apache.log4j.Logger; import org.springframework.stereotype.Service; -import com.platform.controller.FilePackageController; import com.platform.dao.VolumeDao; import com.platform.entities.Brick; -import com.platform.entities.VolumeEntity; +import com.platform.entities.VolumeDataEntity; import com.platform.entities.VolumeInitEntity; -import com.platform.glusterfs.SetVolume; +import com.platform.http.gfs.SetVolume; import com.platform.service.IGfsService; import com.platform.service.IVolumeService; -import com.platform.utils.Configs; @Service(value = "volumeService") public class VolumeServiceImpl implements IVolumeService { - public static Logger log = Configs.DAILY_ROLLING_LOGGER.getLogger(VolumeServiceImpl.class); + public final static Logger log = Logger.getLogger(VolumeServiceImpl.class); - /** gfs的api */ - SetVolume volumeService = new SetVolume(); + /** gfs的 web 服务的 api */ + SetVolume setVolume = new SetVolume(); @Resource(name = "gfsService") private IGfsService gfsService; @@ -37,16 +35,16 @@ public class VolumeServiceImpl implements IVolumeService { @Override - public int save(VolumeEntity entity) throws Exception { + public int save(VolumeDataEntity entity) throws Exception { int rest = 1; //createVolume("lili_test1", 0, "distributed", bricksToCreate, "/home/lili_test1_point") - List result = gfsService.getAllVolumes(); - List addVolumes = new ArrayList(); - VolumeEntity volumeTmp = null; + List result = gfsService.getAllVolumes(); + List addVolumes = new ArrayList(); + VolumeDataEntity volumeTmp = null; if (null != result) { boolean isExits = false; //.trim() 去掉空格 - for (VolumeEntity volumeOnServer : result) { + for (VolumeDataEntity volumeOnServer : result) { if(entity.getName().trim().equals(volumeOnServer.getName().trim())){ isExits = true; //TODO 服务器上有该volume， @@ -62,7 +60,7 @@ public class VolumeServiceImpl implements IVolumeService { } boolean isContinue = true; // 对比volume信息--原数据没有该volume，则新增volume: - for (VolumeEntity add : addVolumes) { + for (VolumeDataEntity add : addVolumes) { List bristr = new ArrayList(); if (null == add.getName() || "".equals(add.getName())) { continue; @@ -82,7 +80,8 @@ public class VolumeServiceImpl implements IVolumeService { //创建volume if (bristr.size() > 0) { - int createreslt = volumeService.createVolume(add.getName(), 0, "distributed", bristr, add.getPath()); + //TODO 换成 web 请求 + int createreslt = setVolume.createVolume(add.getName(), 0, "distributed", bristr, add.getPath()); if (createreslt != 1) { rest = createreslt; } @@ -116,7 +115,8 @@ public class VolumeServiceImpl implements IVolumeService { newKeys.addAll(newBrickKeys); // 新增brick s， if (newKeys.size() > 0) { - int createreslt = volumeService.addBrickVolume(entity.getName(), newKeys, 0, "distributed"); + //TODO 换成 web 请求 + int createreslt = setVolume.addBrickVolume(entity.getName(), newKeys, 0, "distributed"); if (createreslt != 1) { rest = createreslt; } @@ -132,7 +132,8 @@ public class VolumeServiceImpl implements IVolumeService { deleteKeys.addAll(serverBrickKeys); // 删除brick s， if (deleteKeys.size() > 0) { - int createreslt = volumeService.deleteBrickVolume(entity.getName(), deleteKeys, 0, "distributed"); + //TODO 换成 web 请求 + int createreslt = setVolume.deleteBrickVolume(entity.getName(), deleteKeys, 0, "distributed"); if (createreslt != 1) { rest = createreslt; } @@ -153,29 +154,37 @@ public class VolumeServiceImpl implements IVolumeService { } @Override - public int delete(VolumeEntity entity) throws Exception { + public int delete(VolumeDataEntity entity) throws Exception { if (null == entity.getName() || "".equals(entity.getName())) { return -1; } - int rest = volumeService.deleteVolume(entity.getName()); + //TODO 换成 web 请求 + int rest = setVolume.deleteVolume(entity.getName()); volumeDao.remove(entity.getName()); return rest; } @Override - public int start(VolumeEntity entity) throws Exception { + public int start(VolumeDataEntity entity) throws Exception { if (null == entity.getName() || "".equals(entity.getName())) { return -1; } - return volumeService.startVolume(entity.getName()); + //TODO 换成 web 请求 + return setVolume.startVolume(entity.getName()); } @Override - public int stop(VolumeEntity entity) throws Exception { + public int stop(VolumeDataEntity entity) throws Exception { if (null == entity.getName() || "".equals(entity.getName())) { return -1; } - return volumeService.stopVolume(entity.getName()); + //TODO 换成 web 请求 + return setVolume.stopVolume(entity.getName()); + } + + @Override + public String getAllvolume() throws Exception { + return setVolume.getAllvolume(); } } diff --git a/src/com/platform/service/thread/ThreadMoveData.java b/src/com/platform/service/thread/ThreadMoveData.java index 331dbd8a..8da2fd12 100644 --- a/src/com/platform/service/thread/ThreadMoveData.java +++ b/src/com/platform/service/thread/ThreadMoveData.java @@ -1,7 +1,10 @@ package com.platform.service.thread; +import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -11,18 +14,20 @@ import org.apache.log4j.Logger; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import com.base.TaskOperateData; import com.platform.dao.DataInfoDao; import com.platform.dao.DataInfoMoveTmpDao; import com.platform.entities.DataInfoEntity; import com.platform.entities.DataInfoEntityMoveTmp; import com.platform.glusterfs.CheckoutMD5; -import com.platform.glusterfs.CopyData; +import com.platform.http.gfs.CopyData; import com.platform.glusterfs.ShowData; import com.platform.utils.Bean2MapUtils; import com.platform.utils.Constant; import com.platform.utils.DateForm; +import com.platform.utils.FileOperateHelper; -/** 数据迁移 +/** 数据迁移---(该类不用了，丢弃) * @author chen * */ @@ -58,8 +63,127 @@ public class ThreadMoveData{ public ThreadMoveData() { } - //5秒 - @Scheduled(fixedDelay = 5000) + //迁移数据 -- 2016-11-30后 使用 + @Scheduled(fixedDelay = 4000) + public void moveDataByWebGfs(){ + List result = new ArrayList(); + List[] subMove = new ArrayList[4]; + for (int i = 0; i < 4; i++) { + subMove[i] = new ArrayList(); + } + try { + result = dataInfoMoveTmpDao.findAll(); + } catch (Exception e) { + log.error(e); + } + Map taskMap = new HashMap(); + if (result.size() > 0) { + List list = new ArrayList(); + try { + list = copy.operationTask(); + } catch (Exception e) { + log.error("copy.operationTask()"); + log.error(e); + } + for (TaskOperateData taskOperateData : list) { + taskMap.put(FileOperateHelper.addLastLinuxSeparator(taskOperateData.getSourcePath()) + + "-" + FileOperateHelper.addLastLinuxSeparator(taskOperateData.getDestPath()), + taskOperateData); + } + } + for ( DataInfoEntityMoveTmp moveE : result) { + switch (moveE.getCompleteStatus()) { + //待迁移 + case "0": + subMove[0].add(moveE); + break; + //正在迁移 + case "1": + subMove[1].add(moveE); + break; + //迁移完成的 + case "2": + subMove[2].add(moveE); + break; + //迁移失败 + case "3": + subMove[3].add(moveE); + break; + default: + break; + } + } + //迁移失败---不处理 status = -1：表示迁移完成，校验失败,-2:表示迁移失败 -3：表示删除失败 + + //迁移完成的--不处理 status = 3：表示校验成功， + + //正则迁移 status = 1：表示正在迁移(如果 web gfs 迁移成功 则 增加一条记录) + if(subMove[1].size() > 0){ + for (DataInfoEntityMoveTmp moveE : subMove[1]) { + TaskOperateData taskOne = taskMap.get(FileOperateHelper.addLastLinuxSeparator(moveE.getDataPath()) + +"-"+FileOperateHelper.addLastLinuxSeparator(makeDstPath(moveE.getDstPath()))); + if (null == taskOne) { + long nowTime = new Date().getTime(); + long timelong = nowTime - DateForm.string2DateBysecond(moveE.getLastTime()).getTime(); + if (timelong > 1000*60*20) { + try { + dataInfoMoveTmpDao.update(moveE); + } catch (Exception e) { + log.error(e); + } + } + continue; + } + moveE.setRate(taskOne.getProgress()); + moveE.setLastTime(DateForm.date2StringBysecond(new Date())); + if (3 == taskOne.getStatus()) { + //成功 + makeDataInfo(moveE); + }else if(taskOne.getStatus() < 0){ + //失败 + moveE.setCompleteStatus("3"); + try { + dataInfoMoveTmpDao.update(moveE); + } catch (Exception e) { + log.error(e); + } + } + + } + } + + //待迁移 status = 0：准备迁移（则开始迁移） + if(subMove[0].size() > 0){ + //正则迁移的 数量 + int curMoveNum = subMove[1].size(); + for ( DataInfoEntityMoveTmp moveE : subMove[0]) { + if(curMoveNum <= Constant.moveFileMaxNum){ + moveE.setLastTime(DateForm.date2StringBysecond(new Date())); + //请求迁移 + curMoveNum++; + try { + if(1==copy.copyFolder(moveE.getDataPath(), makeDstPath(moveE.getDstPath()))){ + moveE.setCompleteStatus("1"); + } + else { + moveE.setCompleteStatus("3"); + } + } catch (Exception e) { + log.error("copy.copyFolder()"); + log.error(e); + } + try { + dataInfoMoveTmpDao.update(moveE); + } catch (Exception e) { + log.error(e); + } + } + } + } + } + + //5秒 //2016-11-30后 不使用 +// @Scheduled(fixedDelay = 5000) public void doSomething() { try { @@ -175,6 +299,12 @@ public class ThreadMoveData{ } + /** md5校验 + * @param srcSizeTemp + * @param dstSize + * @param dataMove + * @throws Exception + */ private void doMd5(long srcSizeTemp, long dstSize, DataInfoEntityMoveTmp dataMove) throws Exception { int difSize = (int) (srcSizeTemp-dstSize); @@ -187,22 +317,35 @@ public class ThreadMoveData{ int resl = check.checkoutMD5Folder(dataMove.getDataPath(), dataMove.getDstPath()); // 校验成功--则增加数据库记录 if(resl == 1){ + try{ // 判断 迁移数据的status是否改为 2 - DataInfoEntityMoveTmp movetmp = dataInfoMoveTmpDao.findById(dataMove.getId()); - if (null != movetmp && !"2".equals(movetmp.getCompleteStatus())) { - //校验成功--修改 数据库记录-- - dataMove.setCompleteStatus("2"); - dataMove.setLastTime(DateForm.date2StringBysecond(new Date())); - dataInfoMoveTmpDao.update(dataMove); - //TODO 新增 一条数据-到-dataInfo - DataInfoEntity data = (DataInfoEntity) Bean2MapUtils.convertMap( - DataInfoEntity.class, Bean2MapUtils.convertBean(dataMove)); - data.setDataPath(dataMove.getDstPath()); - data.setVolumeIp(dataMove.getDstVolumeIp()); - data.setVolumePath(dataMove.getDstVolumePath()); - data.setVolumeIp(dataMove.getVolumeIp()); - data.setId(0); - dataInfoDao.save(data); + DataInfoEntityMoveTmp movetmp = dataInfoMoveTmpDao.findById(dataMove.getId()); + if(null != movetmp){ + if (!"2".equals(movetmp.getCompleteStatus())) { + //校验成功--修改 数据库记录-- + dataMove.setCompleteStatus("2"); + dataMove.setLastTime(DateForm.date2StringBysecond(new Date())); + dataInfoMoveTmpDao.update(dataMove); + //TODO 新增 一条数据-到-dataInfo + DataInfoEntity data = (DataInfoEntity) Bean2MapUtils.convertMap( + DataInfoEntity.class, Bean2MapUtils.convertBean(dataMove)); + data.setDataPath(dataMove.getDstPath()); + data.setVolumeIp(dataMove.getDstVolumeIp()); + data.setVolumePath(dataMove.getDstVolumePath()); + data.setVolumeIp(dataMove.getVolumeIp()); + data.setPayResult(dataMove.getPayResult()); + data.setExecResult(dataMove.getExecResult()); + data.setId(0); + dataInfoDao.save(data); + } + else { + dataMove.setCompleteStatus("2"); + dataMove.setLastTime(DateForm.date2StringBysecond(new Date())); + dataInfoMoveTmpDao.update(dataMove); + } + } + }catch(Exception e){ + log.error(e); } } else { @@ -210,8 +353,67 @@ public class ThreadMoveData{ dataMove.setLastTime(DateForm.date2StringBysecond(new Date())); dataMove.setCompleteStatus("3"); } + } - + private int makeDataInfo(DataInfoEntityMoveTmp dataMove){ + try{ + // 判断 迁移数据的status是否改为 2 + DataInfoEntityMoveTmp movetmp = dataInfoMoveTmpDao.findById(dataMove.getId()); + if(null != movetmp){ + if (!"2".equals(movetmp.getCompleteStatus())) { + //校验成功--修改 数据库记录-- + dataMove.setCompleteStatus("2"); + dataMove.setLastTime(DateForm.date2StringBysecond(new Date())); + dataInfoMoveTmpDao.update(dataMove); + //TODO 新增 一条数据-到-dataInfo + DataInfoEntity data = (DataInfoEntity) Bean2MapUtils.convertMap( + DataInfoEntity.class, Bean2MapUtils.convertBean(dataMove)); + data.setDataPath(dataMove.getDstPath()); + if (null == dataMove.getDstVolumeIp()) { + data.setVolumeIp("localhost"); + }else { + data.setVolumeIp(dataMove.getDstVolumeIp()); + } + // volume路径，，没有传入 + if (null == dataMove.getDstVolumePath()) { + data.setVolumePath(dataMove.getDstPath()); + }else { + data.setVolumePath(dataMove.getDstVolumePath()); + } + data.setPayResult(dataMove.getPayResult()); + data.setExecResult(dataMove.getExecResult()); + data.setId(0); + try { + dataInfoDao.save(data); + } catch (Exception e) { + log.error(e); + dataMove.setCompleteStatus("1"); + dataInfoMoveTmpDao.update(dataMove); + } + } + }else { + dataInfoMoveTmpDao.update(dataMove); + } + }catch(Exception e){ + log.error(e); + } + return 1; + } + + /** 去掉 最后 的 数字 +/ + * @param dstPath + * @return + */ + private String makeDstPath(String dstPath) { + // 末尾 含有 数字 + / + Pattern pattern2 = Pattern.compile("\\d+\\/$"); + Matcher matcher2 = pattern2.matcher(dstPath); + //去掉 最后 的 数字 +/ 符合 + if (matcher2.find()) { + String removeStr = matcher2.group(); + dstPath = dstPath.replace(removeStr, ""); + } + return dstPath; } } diff --git a/src/com/platform/utils/Bean2MapUtils.java b/src/com/platform/utils/Bean2MapUtils.java index fd479317..3c5aa982 100644 --- a/src/com/platform/utils/Bean2MapUtils.java +++ b/src/com/platform/utils/Bean2MapUtils.java @@ -25,7 +25,7 @@ public class Bean2MapUtils { * @throws InvocationTargetException * 如果调用属性的 setter 方法失败 */ - public static Object convertMap(Class type, Map map) + public static Object convertMap(Class type, Map map) throws IntrospectionException, IllegalAccessException, InstantiationException, InvocationTargetException { BeanInfo beanInfo = Introspector.getBeanInfo(type); // 获取类属性 @@ -62,10 +62,10 @@ public class Bean2MapUtils { * @throws IllegalAccessException 如果实例化 JavaBean 失败 * @throws InvocationTargetException 如果调用属性的 setter 方法失败 */ - public static Map convertBean(Object bean) + public static Map convertBean(Object bean) throws IntrospectionException, IllegalAccessException, InvocationTargetException { - Class type = bean.getClass(); - Map returnMap = new HashMap(); + Class type = bean.getClass(); + Map returnMap = new HashMap(); BeanInfo beanInfo = Introspector.getBeanInfo(type); PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors(); diff --git a/src/com/platform/utils/BeanCopy.java b/src/com/platform/utils/BeanCopy.java index 5700bddd..1de917fa 100644 --- a/src/com/platform/utils/BeanCopy.java +++ b/src/com/platform/utils/BeanCopy.java @@ -60,7 +60,7 @@ public class BeanCopy { if (null != value) field.set(dst, value); } catch (Exception e) { - log.error(e.getStackTrace()); + log.error(e); } } } diff --git a/src/com/platform/utils/CacheTreeData.java b/src/com/platform/utils/CacheTreeData.java index 4430be0e..681481a8 100644 --- a/src/com/platform/utils/CacheTreeData.java +++ b/src/com/platform/utils/CacheTreeData.java @@ -3,7 +3,7 @@ package com.platform.utils; import java.util.List; import com.platform.entities.FolderNode; -import com.platform.entities.VolumeEntity; +import com.platform.entities.VolumeDataEntity; /** 存储gfs服务的 volume信息和目录结构 * @author chen @@ -19,7 +19,7 @@ public class CacheTreeData { /** * 所有 volume */ - private static List volumeList = null; + private static List volumeList = null; /** 获得所有目录 * @return @@ -38,14 +38,14 @@ public class CacheTreeData { /** 获得 所有的 volume * @return the volumeList */ - public static List getVolumeList() { + public static List getVolumeList() { return volumeList; } /** 重置所有的 volume * @param volumeList the volumeList to set */ - public synchronized static void setVolumeList(List volumeList) { + public synchronized static void setVolumeList(List volumeList) { CacheTreeData.volumeList = volumeList; } diff --git a/src/com/platform/utils/ConfigsLoader.java b/src/com/platform/utils/ConfigsLoader.java index 1ba96318..371b6008 100644 --- a/src/com/platform/utils/ConfigsLoader.java +++ b/src/com/platform/utils/ConfigsLoader.java @@ -5,7 +5,7 @@ import java.util.Properties; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import com.platform.http.gfs.HttpClientConstant; +import com.platform.http.HttpClientConstant; /** web容器初始化 * @author chen diff --git a/src/com/platform/utils/FileOperateHelper.java b/src/com/platform/utils/FileOperateHelper.java index 5d485201..3bb40c6f 100644 --- a/src/com/platform/utils/FileOperateHelper.java +++ b/src/com/platform/utils/FileOperateHelper.java @@ -6,9 +6,6 @@ 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; import org.apache.log4j.Logger; @@ -193,19 +190,43 @@ public class FileOperateHelper { return path; } - + public static String addLastLinuxSeparator(String path){ + //去掉 File.separator + path = removeLastLinuxSeparator(path); + // 末尾 加上 / + path = path + "/"; + return path; + } public static String removeLastSeparator(String path){ // 递归去掉 所有 结尾 / if (path.length() < 1) { return path; } - String sep = "\\"+File.separator; - Pattern pattern2 = Pattern.compile(sep+"$"); - Matcher matcher2 = pattern2.matcher(path); - if (matcher2.find()) { +// String sep = "\\"+File.separator; +// Pattern pattern2 = Pattern.compile(sep+"$"); +// Matcher matcher2 = pattern2.matcher(path); +// if (matcher2.find()) { +// path = path.substring(0, path.length()-1); +// path = removeLastSeparator(path); +// } + String sep = File.separator; + if (path.endsWith(sep)) { + path = path.substring(0, path.length()-1); + path = removeLastLinuxSeparator(path); + } + return path; + } + + public static String removeLastLinuxSeparator(String path){ + // 递归去掉 所有 结尾 / + if (path.length() < 1) { + return path; + } + String sep = "/"; + if (path.endsWith(sep)) { path = path.substring(0, path.length()-1); - path = removeLastSeparator(path); + path = removeLastLinuxSeparator(path); } return path; } diff --git a/src/com/platform/utils/GetVolumeInfo.java b/src/com/platform/utils/GetVolumeInfo.java new file mode 100644 index 00000000..a3c02411 --- /dev/null +++ b/src/com/platform/utils/GetVolumeInfo.java @@ -0,0 +1,30 @@ +package com.platform.utils; + +import java.util.ArrayList; +import java.util.List; + +import com.platform.entities.FolderNode; +import com.platform.entities.VolumeDataEntity; +import com.platform.http.gfs.SetVolume; + +public class GetVolumeInfo { + + /** 将gfs 的 volume\folder 存入缓存 + * + */ + public void getVolumeMsg() throws Exception{ + List folderlist = new ArrayList(); + List volumeList = new ArrayList(); + SetVolume volumeClient = new SetVolume(); + volumeList = volumeClient.getAllvolumeEntity(); + for (VolumeDataEntity volumeEntity : volumeList) { + if (null != volumeEntity.getFolder()) { + folderlist.addAll(volumeEntity.getFolder()); + } + } + // 更新folder 目录 + CacheTreeData.setVolumeList(volumeList); + CacheTreeData.setFolders(folderlist); + } + +} diff --git a/src/com/platform/utils/ThreadVolume.java b/src/com/platform/utils/ThreadVolume.java index de41a723..3e5027d5 100644 --- a/src/com/platform/utils/ThreadVolume.java +++ b/src/com/platform/utils/ThreadVolume.java @@ -1,43 +1,27 @@ package com.platform.utils; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import net.sf.json.JSONArray; - import org.apache.log4j.Logger; -import org.springframework.stereotype.Service; import com.base.Custom4exception; -import com.base.CustomException; -import com.platform.controller.FilePackageController; -import com.platform.entities.Brick; -import com.platform.entities.FolderNode; -import com.platform.entities.VolumeEntity; -import com.platform.glusterfs.ClusterInfo; -import com.platform.glusterfs.GetTreeData; -import com.platform.glusterfs.VolumeInfo; -import com.platform.http.gfs.HttpUtils; +/** 定时查询 volume + * @author chen + * + */ public class ThreadVolume extends Thread { - @SuppressWarnings("static-access") - public static Logger log = Configs.DAILY_ROLLING_LOGGER.getLogger(ThreadVolume.class); + public final static Logger log = Logger.getLogger(ThreadVolume.class); + /** + * 获取 volume信息 + */ + private GetVolumeInfo vo = new GetVolumeInfo(); + /** * 挂载点路径 -- 暂时无用的 */ private static String pointPath = "/home"; - /** Volume信息查询 */ - private VolumeInfo volumeInfo = new VolumeInfo(); - - private ClusterInfo cluster = new ClusterInfo(); - - /** gfs目录树形展示 */ - private GetTreeData gfsTree = new GetTreeData(); - public ThreadVolume() { setName("ThreadVolume"); } @@ -57,11 +41,10 @@ public class ThreadVolume extends Thread { super.run(); while (true) { try { - getVolumeMsg(); + vo.getVolumeMsg(); Thread.sleep(Constant.get_volume_sleep_time); - } catch (InterruptedException e) { - new CustomException( - Custom4exception.threadVolume_Thread_Except, e); + } catch (Exception e) { + log.error(Custom4exception.threadVolume_Thread_Except, e); } } @@ -76,137 +59,4 @@ public class ThreadVolume extends Thread { ThreadVolume.pointPath = pointPath; } - public void getVolumeMsg() { - List folderlist = new ArrayList(); - List volumeList = new ArrayList(); - HttpUtils ht = new HttpUtils(); - String rest = ht.sendPost("gfs/getAllvolume", null); -// JSONArray jsondata = JSONArray.fromObject(volumeList); - if (null == rest || "".equals(rest)) { - log.error(" --- gluster is disconnect ! \n"); - return; - } - JSONArray json = JSONArray.fromObject(rest); - @SuppressWarnings("unchecked") - List volumes = (List)JSONArray.toCollection(json, VolumeEntity.class); - for (VolumeEntity volumeEntity : volumes) { -// if (null != volumeEntity.getFolder()) { -// JSONArray foldJson = JSONArray.fromObject(volumeEntity.getFolder()); -// List folders = (List)JSONArray.toCollection(foldJson, FolderNode.class); -// folderlist.addAll(folders); - volumeEntity.setBrick(setBricks(volumeEntity.getBrick())); - volumeEntity.setFolder(setChildFolders(volumeEntity.getFolder())); -// } - } - volumeList = volumes; - -// // brick状态 map集合 -// Map brickStatusMap = cluster.showClusterInfo(); -// -// // 查询 volume name -// List volumeNameList = volumeInfo.showAllVolumeName(); -// if (null != volumeNameList) { -// for (String volumeName : volumeNameList) { -// try { -// VolumeEntity volume = new VolumeEntity(); -// volume.setName(volumeName); -// List path = volumeInfo -// .getVolumeMountPoint(volumeName); -// // 默认加载第一个路径 -// if (null != path) { -// for (String one : path) { -// if (!one.contains("df")) { -// volume.setPath(one); -// } -// } -// } -// if (null == volume.getPath()) { -// volume.setPath(""); -// } -// volume.setAllSize((double) (volumeInfo -// .getVolumeAvailableSize(volumeName) -// + volumeInfo.getVolumeUseSize(volumeName))); -// // 状态Started,Stopped,Created -// String status = volumeInfo.getVolumeStatus(volumeName); -// if ("Started".equals(status)) { -// volume.setStatus(true); -// } else { -// volume.setStatus(false); -// } -// volume.setUsedSize((double) volumeInfo.getVolumeUseSize(volumeName)); -// volume.setType(volumeInfo.getVolumeType(volumeName)); -// // TODO 查询brick-- -// // 返回 ip:path -// List brickStrs = volumeInfo -// .getVolumeBricks(volumeName); -// // brick已用大小： -// Map usedSize = volumeInfo -// .getVolumebricksDataSize(volumeName); -// Map availableSize = volumeInfo -// .getVolumebricksAvailableSize(volumeName); -// -// List brickList = new ArrayList(); -// for (String brickIpPath : brickStrs) { -// Brick b = new Brick(); -// String ipAndpath[] = brickIpPath.split(":"); -// String brickip = ipAndpath[0]; -// String brickpath = ipAndpath[1]; -// // iP , path , -// b.setIp(brickip); -// if (brickStatusMap == null -// || brickStatusMap.size() == 0) { -// b.setStatus(false); -// } else if (brickStatusMap.containsKey(brickip)) { -// b.setStatus(true); -// } else { -// b.setStatus(false); -// } -// b.setPath(brickpath); -// b.setAvailableSize(availableSize.get(brickIpPath)); -// b.setUsedSize(usedSize.get(brickIpPath)); -// brickList.add(b); -// } -// volume.setBrick(brickList); -// -// // 默认加载第一个路径 -// if (null != path && path.size() > 0) { -// // 装入 folder： -// // 查询 每个 volume 下的 folder -// FolderNode foldertmp = gfsTree.getDatas(path.get(0)); -// folderlist.add(foldertmp); -// } -// volumeList.add(volume); -// } catch (Exception e) { -// new CustomException( -// Custom4exception.threadVolume_class_Except, e); -// } -// } -// } - // 更新folder 目录 - CacheTreeData.setFolders(folderlist); - CacheTreeData.setVolumeList(volumeList); - } - - private List setChildFolders(List folds) { - List folders = null; - if (null != folds) { - JSONArray foldJson = JSONArray.fromObject(folds); - folders = (List)JSONArray.toCollection(foldJson, FolderNode.class); - for (FolderNode folderNode : folders) { - List childFolds = folderNode.getChildNodes(); - folderNode.setChildNodes(setChildFolders(childFolds)); - } - } - return folders; - } - - private List setBricks(List bricks) { - List bs = null; - if (null != bricks) { - JSONArray bsJson = JSONArray.fromObject(bricks); - bs = (List)JSONArray.toCollection(bsJson, Brick.class); - } - return bs; - } - } diff --git a/src/com/platform/utils/ThreadVolumeImm.java b/src/com/platform/utils/ThreadVolumeImm.java index beaa5613..067a631d 100644 --- a/src/com/platform/utils/ThreadVolumeImm.java +++ b/src/com/platform/utils/ThreadVolumeImm.java @@ -1,9 +1,17 @@ package com.platform.utils; +import org.apache.log4j.Logger; + +import com.base.Custom4exception; + +/** 立即查询 volume一次 + * @author chen + * + */ public class ThreadVolumeImm extends Thread{ + public final static Logger log = Logger.getLogger(ThreadVolume.class); public ThreadVolumeImm() { - // TODO Auto-generated constructor stub } public ThreadVolumeImm(String name) { @@ -12,7 +20,11 @@ public class ThreadVolumeImm extends Thread{ @Override public void run() { - new ThreadVolume().getVolumeMsg(); + try { + new GetVolumeInfo().getVolumeMsg(); + } catch (Exception e) { + log.error(Custom4exception.threadVolume_Thread_Except, e); + } } } diff --git a/src/com/platform/utils/getTreeDataByPath.java b/src/com/platform/utils/getTreeDataByPath.java index bfe54679..5dbfb9be 100644 --- a/src/com/platform/utils/getTreeDataByPath.java +++ b/src/com/platform/utils/getTreeDataByPath.java @@ -2,8 +2,6 @@ package com.platform.utils; import java.util.List; -import net.sf.json.JSONArray; - import com.platform.entities.FolderNode; public class getTreeDataByPath {