From 1620ed5b7879a43742c79f4ab9989d5bd9d8c98b Mon Sep 17 00:00:00 2001 From: baohanddd Date: Sat, 30 Apr 2016 19:08:21 +0800 Subject: [PATCH] =?UTF-8?q?add=20data=20import=20:=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E3=80=81=E9=83=A8=E9=97=A8=E3=80=81=E7=94=A8=E6=88=B7(?= =?UTF-8?q?=E5=8C=BB=E7=94=9F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataImportTaskServiceImpl.java | 26 +++++++++++++--------- .../operate/web/controller/RegionController.java | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java index 10819b3..68f7fc0 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java @@ -85,7 +85,11 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { try { // organization if (StringUtils.isBlank(organization.getForeignId()) || !organization.getForeignId().equals(map.get("H_ID"))) { - organization.setForeignId(map.get("H_ID").toString()); + if (!organizationMap.containsKey(map.get("H_ID").toString())) { + organization = new Organization(); + organization.setForeignId(map.get("H_ID").toString()); + organizationMap.put(organization.getForeignId(),organization); + } organization.setYn(YnEnums.YES.getId()); organization.setName(map.get("H_NAME").toString()); organization.setAreaId(map.get("H_COUNTYNO") == null ? null : map.get("H_COUNTYNO").toString()); @@ -98,13 +102,15 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { organization.setPublishId(0); organization.setPublishName("system"); organization.setModified(new Date()); - if (!organizationMap.containsKey(organization.getForeignId())) { - organizationMap.put(organization.getForeignId(),organization); - } } // Departments if (StringUtils.isBlank(departments.getForeignId()) || !departments.getForeignId().equals(map.get("D_ID"))) { + if (!organization.getDepartmentsMap().containsKey(map.get("D_ID").toString())) { + departments = new Departments(); + departments.setForeignId(map.get("D_ID").toString()); + organization.getDepartmentsMap().put(departments.getForeignId(), departments); + } departments.setPublishName("system"); departments.setType(2); departments.setPublishId(0); @@ -113,19 +119,20 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { departments.setForeignId(map.get("D_ID").toString()); departments.setModified(new Date()); departments.setName(map.get("D_NAME") == null ? null : map.get("D_NAME").toString()); - if (!organization.getDepartmentsMap().containsKey(departments.getForeignId())) { - organization.getDepartmentsMap().put(departments.getForeignId(), departments); - } } // users if (StringUtils.isBlank(users.getForeignId()) || !users.getForeignId().equals(map.get("U_ID"))) { + if (!departments.getUsersMap().containsKey(map.get("U_ID").toString())) { + users = new Users(); + users.setForeignId(map.get("U_ID").toString()); + departments.getUsersMap().put(users.getForeignId(), users); + } users.setPublishId(0); users.setPublishName("system"); users.setOrgId(organization.getId()); users.setName(map.get("E_NAME") == null ? null : map.get("E_NAME").toString()); users.setAccount(map.get("U_USERNAME") == null ? null : map.get("U_USERNAME").toString()); - users.setForeignId(map.get("U_ID").toString()); users.setYn(YnEnums.YES.getId()); users.setModified(new Date()); users.setDeptId(departments.getId()); @@ -136,9 +143,6 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { users.setEnable(2); } users.setKsId(departments.getId()); - if (!departments.getUsersMap().containsKey(users.getForeignId())) { - departments.getUsersMap().put(users.getForeignId(), users); - } //TODO 手机号，权限 对应中间表 // users.setPhone(""); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java index 259c270..f37abab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java @@ -34,7 +34,7 @@ public class RegionController extends RestController{ @TokenRequired @RequestMapping(value = "/regions",method = RequestMethod.GET) - public void getRegions(@RequestParam(value = "parentId") String parentId, + public void getRegions(@RequestParam(value = "parentId", required = false) String parentId, HttpServletResponse httpServletResponse){ if ("0".equals(parentId) || StringUtils.isBlank(parentId)) { parentId = SystemConfig.CHINA_BASIC_ID; -- 1.8.3.1