diff --git a/.gitignore b/.gitignore index b961a961..7d6716ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,10 @@ /target /build .classpath -.settings -.metadata +/RemoteSystemsTempFiles /bin/ .project -/RemoteSystemsTempFiles +.settings +.metadata + + diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java index 0f478c32..b4c005b2 100644 --- a/src/com/platform/controller/DataModelController.java +++ b/src/com/platform/controller/DataModelController.java @@ -17,6 +17,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -130,7 +131,7 @@ public class DataModelController extends BaseController{ @RequestMapping(value="/oracle/{name}/extract", method= RequestMethod.POST) public void oracleExtract(HttpServletRequest res, - HttpServletResponse req, String name) throws Exception { + HttpServletResponse req,@PathVariable String name) throws Exception { res.setCharacterEncoding("UTF-8"); System.out.println("------extract-------"); System.out.println(name); @@ -191,8 +192,7 @@ public class DataModelController extends BaseController{ } @RequestMapping(value = "/volume/{name}/move", method= RequestMethod.POST) -// @ResponseBody - public void volumeMove(HttpServletRequest res, HttpServletResponse req, String name, + public void volumeMove(HttpServletRequest res, HttpServletResponse req,@PathVariable String name, FolderNode selectNode, DataInfoEntity selectItems) throws Exception { res.setCharacterEncoding("UTF-8"); System.out.println("get Request"); @@ -256,21 +256,23 @@ public class DataModelController extends BaseController{ } @RequestMapping(value="/oracle/{id}/delete", method= RequestMethod.POST) - @ResponseBody - public void oracleDelete(int id) throws Exception { + public void oracleDelete(@PathVariable String id) throws Exception { log.debug("----------deleteOracleInfo----------------"); - mySqlService.deleteMySql(id); + Integer num = Integer.valueOf(id); + mySqlService.deleteMySql(num); } @RequestMapping(value="/oracle/{id}/insert", method= RequestMethod.POST) @ResponseBody - public void oracleInsert(GatherOracleInfo oracle) throws Exception { + public void oracleInsert(@PathVariable String id, @RequestBody GatherOracleInfo oracle) throws Exception { log.debug("----------insertOracleInfo----------------"); + oracle.setId(Integer.valueOf(id)); mySqlService.insertOracle(oracle); } @RequestMapping(value="/oracle/{id}/update", method= RequestMethod.POST) - public void oracleUpdate(@RequestBody GatherOracleInfo oracle) throws Exception { + @ResponseBody + public void oracleUpdate(@PathVariable("id") String id, @RequestBody GatherOracleInfo oracle) throws Exception { log.debug("----------updateOracleInfo-----------------------"); log.debug(oracle); mySqlService.updateOracle(oracle); @@ -284,17 +286,19 @@ public class DataModelController extends BaseController{ return result; } - @RequestMapping(value="/task/transfer/delete", method= RequestMethod.POST) + @RequestMapping(value="/task/transfer/{id}/delete", method= RequestMethod.POST) @ResponseBody - public Object taskTransferDelete(DataInfoEntityMoveTmp move) throws Exception { - log.debug("----------/task/transfer/delete-----------------------"); - int result = moveDataService.delete(move); + public Object taskTransferDelete(@PathVariable String id) throws Exception { + log.debug("----------/task/transfer/{id}/delete-----------------------"); + DataInfoEntityMoveTmp move = new DataInfoEntityMoveTmp(); + move.setId(Integer.valueOf(id)); + int result = moveDataService.delete(move ); return result; } @RequestMapping(value="/task/transfer/save", method= RequestMethod.POST) @ResponseBody - public Object taskTransferSave(DataInfoEntity move) throws Exception { + public Object taskTransferSave(@RequestBody DataInfoEntity move) throws Exception { log.debug("---------/task/transfer/save-----------------------"); int result = dfs.save(move); return result; diff --git a/src/com/platform/service/impl/MoveDataServiceImpl.java b/src/com/platform/service/impl/MoveDataServiceImpl.java index c0a6fbbb..b5bcf45d 100644 --- a/src/com/platform/service/impl/MoveDataServiceImpl.java +++ b/src/com/platform/service/impl/MoveDataServiceImpl.java @@ -27,70 +27,76 @@ import com.platform.utils.DateForm; @Component @Service(value = "moveDataService") -public class MoveDataServiceImpl implements IMoveDataService{ - +public class MoveDataServiceImpl implements IMoveDataService { + @Resource(name = "dataInfoDao") private DataInfoDao dataInfoDao; - + private RemoveData removeservice = new RemoveData(); - + /** * 迁移 */ CopyData copy = new CopyData(); - + /** * MD5校验 */ CheckoutMD5 check = new CheckoutMD5(); - + @Resource(name = "dataInfoMoveTmpDao") private DataInfoMoveTmpDao dataInfoMoveTmpDao; - + /** * 查看数据 */ ShowData show = new ShowData(); @Override - public boolean moveData(List data, String dstPath) throws Exception { + public boolean moveData(List data, String dstPath) + throws Exception { boolean isSuccess = false; String tailPath = ""; if (null != data) { - //XXX/320198_16/1,or XXX/320122KFQ_15/1 ---> /320198_16/1, or /320122KFQ_15/1 + // XXX/320198_16/1,or XXX/320122KFQ_15/1 ---> /320198_16/1, or + // /320122KFQ_15/1 List exist = dataInfoMoveTmpDao.findAll(); List existIds = new ArrayList(); if (null != exist) { for (DataInfoEntityMoveTmp dataInfoEntityMoveTmp : exist) { - if ("0".equals(dataInfoEntityMoveTmp.getCompleteStatus()) || "1".equals(dataInfoEntityMoveTmp.getCompleteStatus())) { + if ("0".equals(dataInfoEntityMoveTmp.getCompleteStatus()) + || "1".equals(dataInfoEntityMoveTmp + .getCompleteStatus())) { if (null != dataInfoEntityMoveTmp.getDataPath()) { existIds.add(dataInfoEntityMoveTmp.getDataPath()); } } } } - Pattern pattern = Pattern.compile("\\/\\d+[a-z]*[A-Z]*_\\d+\\/\\d*\\/*$"); + Pattern pattern = Pattern + .compile("\\/\\d+[a-z]*[A-Z]*_\\d+\\/\\d*\\/*$"); // 末尾 含有 / Pattern pattern2 = Pattern.compile("\\/$"); Matcher matcher2 = pattern2.matcher(dstPath); - //去掉 最后 的 / 符合 + // 去掉 最后 的 / 符合 if (matcher2.find()) { - dstPath = dstPath.substring(0, dstPath.length()-1); + dstPath = dstPath.substring(0, dstPath.length() - 1); } List moveList = new ArrayList(); for (DataInfoEntity dataInfoEntity : data) { if (existIds.contains(dataInfoEntity.getDataPath())) { continue; } - //TODO 正则：取出 data 的后面 的 路径，eg: XXX/320198_16/1,or XXX/320122KFQ_15/1） + // TODO 正则：取出 data 的后面 的 路径，eg: XXX/320198_16/1,or + // XXX/320122KFQ_15/1） Matcher matcher = pattern.matcher(dataInfoEntity.getDataPath()); - // tailPath 第一个字符是 / 符号取尾："\\/\\d+[a-z]*[A-Z]*_\\d+\\/\\d*\\/*$" + // tailPath 第一个字符是 / 符号取尾："\\/\\d+[a-z]*[A-Z]*_\\d+\\/\\d*\\/*$" if (matcher.find()) { tailPath = matcher.group(); } String finalDestPath = dstPath + tailPath; Matcher matchertmp2 = pattern2.matcher(finalDestPath); - //去掉 最后 的 / 符合 + // 去掉 最后 的 / 符合 if (!matchertmp2.find()) { finalDestPath = finalDestPath + "/"; } @@ -115,23 +121,23 @@ public class MoveDataServiceImpl implements IMoveDataService{ List result = new ArrayList(); try { result = dataInfoMoveTmpDao.findAll(); - + } catch (Exception e) { System.err.println(e); } return result; } - + @Override public int delete(DataInfoEntityMoveTmp dataMove) throws Exception { - if ("1".equals(dataMove.getCompleteStatus())) { + if ("1".equals(dataMove.getCompleteStatus()) + || "3".equals(dataMove.getCompleteStatus())) { removeservice.deleteFolder(dataMove.getDstPath()); } int result = dataInfoMoveTmpDao.remove(dataMove.getId()); return result; } - @Override public int save(DataInfoEntityMoveTmp data) throws Exception { dataInfoMoveTmpDao.save(data); @@ -149,5 +155,5 @@ public class MoveDataServiceImpl implements IMoveDataService{ int result = dataInfoMoveTmpDao.update(data); return result; } - + } diff --git a/test/com/platform/test/Brick.java b/test/com/platform/test/Brick.java deleted file mode 100644 index f83b37c1..00000000 --- a/test/com/platform/test/Brick.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.platform.test; - -public class Brick { - private String ip; - private String path; - - public Brick(String ip, String path) { - super(); - this.ip = ip; - this.path = path; - } - public String getIp() { - return ip; - } - public void setIp(String ip) { - this.ip = ip; - } - public String getPath() { - return path; - } - public void setPath(String path) { - this.path = path; - } - - -} diff --git a/test/com/platform/test/FolderReader.java b/test/com/platform/test/FolderReader.java deleted file mode 100644 index 57456af1..00000000 --- a/test/com/platform/test/FolderReader.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.platform.test; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import com.platform.entities.FolderNode; - -public class FolderReader { - - public static FolderNode reader(String path) { - FolderNode folderNode = null; - File file = new File(path); - if (file.exists()) { - List childrens = new ArrayList(); - if (file.isDirectory()) { - File[] files = file.listFiles(); - for (int i = 0; i < files.length; i++) { - FolderNode children = reader(files[i].getAbsolutePath()); - if (children != null) - childrens.add(children); - } - } - } - return folderNode; - } - - public static void main(String[] args) { - // TODO Auto-generated method stub - FolderReader folderReader = new FolderReader(); - FolderNode folderNode = folderReader.reader("D:/bootstrap"); - //folderReader.print(folderNode); - } - -} diff --git a/test/com/platform/test/SMBasedTest.java b/test/com/platform/test/SMBasedTest.java deleted file mode 100644 index b0a77f9f..00000000 --- a/test/com/platform/test/SMBasedTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.platform.test; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.FileSystemXmlApplicationContext; - -public class SMBasedTest { - - public ApplicationContext applicationContext; - - public SMBasedTest() { - applicationContext = new FileSystemXmlApplicationContext( - "test/spring-applicationContext-test.xml"); - } - -} diff --git a/test/com/platform/test/TestConnectOralce.java b/test/com/platform/test/TestConnectOralce.java deleted file mode 100644 index ef3f7b0e..00000000 --- a/test/com/platform/test/TestConnectOralce.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.platform.test; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; - -import com.platform.utils.Configs; - -public class TestConnectOralce { - - public static void main(String[] args) { - // TODO Auto-generated method stub - try{ - Class.forName("oracle.jdbc.driver.OracleDriver"); - Configs.CONSOLE_LOGGER.info("Oracle驱动加载成功"); - }catch(Exception e){ - System.out.println(e); - } - String url = "jdbc:oracle:thin:@192.168.0.110:60758:orcl"; - try { - Connection conn = DriverManager.getConnection(url, "system", "oracle"); - System.out.println("连接成功"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - -} diff --git a/test/com/platform/test/TestController.java b/test/com/platform/test/TestController.java deleted file mode 100644 index 94e8aaf0..00000000 --- a/test/com/platform/test/TestController.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.platform.test; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import com.platform.entities.EncodedInfoEntity; -import com.platform.service.EncodeInfoService; - -@Controller -public class TestController { - // private static Logger logger = Logger.getLogger(TestController.class); - @Resource(name = "encodeInfoService") - private EncodeInfoService eis; - - public void setEis(EncodeInfoService eis) { - this.eis = eis; - } - - @RequestMapping("/hello") - @ResponseBody - public List hello(String name, HttpServletResponse res) { - System.out.println(name); - return eis.getAllEncodeInfo("system_info"); - } - - @RequestMapping("/json") - @ResponseBody - public List getJson(HttpServletRequest res, HttpServletResponse req) { - List list = new ArrayList(); - list.add(new User("lisi", 1, "男")); - list.add(new User("zhansan", 2, "男")); - return list; - } - - @RequestMapping("log") - public void testLog(HttpServletResponse res) { - System.out.println(eis.getEncodeNameByCode("1", "system_info")); - } - - @RequestMapping("/data111.json") - public void test(String name, HttpServletResponse res){ - - - } -} diff --git a/test/com/platform/test/TestEncodeInfoDao.java b/test/com/platform/test/TestEncodeInfoDao.java deleted file mode 100644 index 3ad7d492..00000000 --- a/test/com/platform/test/TestEncodeInfoDao.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.platform.test; - -import java.util.List; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import com.platform.dao.EncodeInfoDao; -import com.platform.entities.EncodedInfoEntity; - -public class TestEncodeInfoDao extends SMBasedTest { - - private EncodeInfoDao eiDao; - private String testTableName; - - @Before - public void initBeforeFunction() { - eiDao = (EncodeInfoDao) this.applicationContext - .getBean("encodeInfoDao"); - testTableName = "system_info"; - } - - @Test - public void testGetAllEntityInfo() { - List allEntities = eiDao - .getAllEntityInfo(testTableName); - System.out.println(allEntities); - Assert.assertTrue(allEntities.size() > 0); - } - - @Test - public void testGetEncodeNameByCode() { - String result = eiDao.getEncodeNameByCode("1", testTableName); - Assert.assertTrue(result.equals("预算执行系统")); - } - - @Test - public void testGetEncodeCodeByName() { - List result = eiDao - .getEncodeCodeByName("预算执行系统", testTableName); - Assert.assertTrue(result.size() > 0); - } - - @Test - public void testUpdateEncodeNameByCode() { - int result = eiDao - .updateEncodeNameByCode("3", "财政一体化平台", testTableName); - Assert.assertTrue(result > 0); - } - - @Test - public void testInsertEncodeEntity() { - int result = eiDao.insertEncodeEntity(new EncodedInfoEntity("非税收入系统", - "4"), testTableName); - Assert.assertTrue(result == 1); - } - - @Test - public void testDeleteEncodeByCode() { - int result = eiDao.deleteEncodeByCode("5", testTableName); - Assert.assertTrue(result >= 1); - } -} diff --git a/test/com/platform/test/TestEncodeService.java b/test/com/platform/test/TestEncodeService.java deleted file mode 100644 index a790ebe4..00000000 --- a/test/com/platform/test/TestEncodeService.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.platform.test; - -import java.util.List; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import com.platform.entities.EncodedInfoEntity; -import com.platform.service.EncodeInfoService; - -public class TestEncodeService extends SMBasedTest { - - private EncodeInfoService eis; - private String testTableName; - - @Before - public void initBeforeFunction() { - eis = (EncodeInfoService) this.applicationContext - .getBean("encodeInfoService"); - testTableName = "system_info"; - } - - @Test - public void testGetEncodeNameByCode() { - String result = eis.getEncodeNameByCode("2", testTableName); - Assert.assertTrue(result.equals("部门预算")); - } - - /** - * 事务测试 - */ - @Test - public void testDeleteEncodeByCode() { - eis.deleteEncodeByCode("4", testTableName); - } - - @Test - public void testGetAllEncodeInfo() { - List allEntities = eis - .getAllEncodeInfo(testTableName); - System.out.println(allEntities); - Assert.assertTrue(allEntities.size() >= 1); - } -} diff --git a/test/com/platform/test/User.java b/test/com/platform/test/User.java deleted file mode 100644 index e96fbc11..00000000 --- a/test/com/platform/test/User.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.platform.test; - -public class User { - private String name; - private int id; - private String sex; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getSex() { - return sex; - } - - public void setSex(String sex) { - this.sex = sex; - } - - public User(String name, int id, String sex) { - super(); - this.name = name; - this.id = id; - this.sex = sex; - } - - public User(){ - - } -} diff --git a/test/com/platform/test/Volume.java b/test/com/platform/test/Volume.java deleted file mode 100644 index 5f6a4423..00000000 --- a/test/com/platform/test/Volume.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.platform.test; - -import java.util.List; - -import com.platform.entities.FolderNode; - -public class Volume { - private String name; - private long totalSize; - private long usedSize; - private List bricks; - private List folderNode; - - public Volume(String volume, long totalSize, long usedSize, - List bricks, List folderNode) { - super(); - this.name = volume; - this.totalSize = totalSize; - this.usedSize = usedSize; - this.bricks = bricks; - this.folderNode = folderNode; - } - - public String getVolume() { - return name; - } - - public void setVolume(String name) { - this.name = name; - } - - public long getTotalSize() { - return totalSize; - } - - public void setTotalSize(long totalSize) { - this.totalSize = totalSize; - } - - public long getUsedSize() { - return usedSize; - } - - public void setUsedSize(long usedSize) { - this.usedSize = usedSize; - } - - public List getBricks() { - return bricks; - } - - public void setBricks(List bricks) { - this.bricks = bricks; - } - - public List getFolderNode() { - return folderNode; - } - - public void setFolderNode(List folderNode) { - this.folderNode = folderNode; - } - -} diff --git a/test/com/platform/test/testSystemInfoDao.java b/test/com/platform/test/testSystemInfoDao.java deleted file mode 100644 index 95be6ef6..00000000 --- a/test/com/platform/test/testSystemInfoDao.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.platform.test; - -import org.junit.Before; - -import com.platform.dao.DataInfoDao; - -public class testSystemInfoDao extends SMBasedTest { - private DataInfoDao dfDao; - - @Before - public void initBeforeFunction() { - dfDao = (DataInfoDao) this.applicationContext.getBean("dataInfoDao"); - } - - // @Test @Test - public void test() { - //System.out.println(dfDao.getCount()); - } -} diff --git a/test/spring-applicationContext-test.xml b/test/spring-applicationContext-test.xml deleted file mode 100644 index 27b1248b..00000000 --- a/test/spring-applicationContext-test.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file