diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java index 3f56b6f8c5..ff52e99ce4 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java @@ -40,12 +40,12 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.IOException; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; import java.util.Arrays; import java.util.Map; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index bdad45e77e..b88368a11d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -249,24 +249,6 @@ public class CustomerAgencyController { return new Result().ok(customerAgencyService.staffInAgencyList(tokenDTO.getUserId())); } - /** - * @Description 对外接口-根据组织Id获取组织信息 - * @author sun - **/ - @PostMapping("agencyinfo") - Result agencyInfo(@RequestBody AgencyInfoFormDTO formDTO) { - return new Result().ok(customerAgencyService.agencyInfo(formDTO)); - } - - /** - * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据 - * @author sun - **/ - @PostMapping("organizetree/{agencyId}") - Result organizeTree(@PathVariable("agencyId") String agencyId) { - return new Result().ok(customerAgencyService.organizeTree(agencyId)); - } - /** * @Description 对外接口，根据customerId返回Element UI中Tree结构的agency列表 * @param map @@ -297,4 +279,22 @@ public class CustomerAgencyController { } return new Result>().ok(customerAgencyService.getAgencyElementTree(customerId).getDefaultKeys()); } + + /** + * @Description 对外接口-根据组织Id获取组织信息 + * @author sun + **/ + @PostMapping("agencyinfo") + Result agencyInfo(@RequestBody AgencyInfoFormDTO formDTO) { + return new Result().ok(customerAgencyService.agencyInfo(formDTO)); + } + + /** + * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据 + * @author sun + **/ + @PostMapping("organizetree/{agencyId}") + Result organizeTree(@PathVariable("agencyId") String agencyId) { + return new Result().ok(customerAgencyService.organizeTree(agencyId)); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index cdf8e10110..9c1735a886 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -176,6 +176,16 @@ public interface CustomerAgencyDao extends BaseDao { **/ AgencyResultDTO selectAgencyByStaffId(@Param("staffId") String staffId); + /** + * @Description 返回elementTree结构的agency树 + * @param customerId + * @param pid + * @return java.util.List + * @Author liushaowen + * @Date 2020/11/6 14:57 + */ + List getAgencyElementTree(@Param("customerId") String customerId,@Param("pid") String pid); + /** * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据 * @author sun @@ -196,14 +206,4 @@ public interface CustomerAgencyDao extends BaseDao { * @author sun **/ List selectAllSub(@Param("agencyId") String agencyId); - - /** - * @Description 返回elementTree结构的agency树 - * @param customerId - * @param pid - * @return java.util.List - * @Author liushaowen - * @Date 2020/11/6 14:57 - */ - List getAgencyElementTree(@Param("customerId") String customerId,@Param("pid") String pid); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index 70954d2d72..8051ca63f5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -214,6 +214,15 @@ public interface CustomerAgencyService extends BaseService **/ StaffInAgencyListResultDTO staffInAgencyList(String staffId); + /** + * @Description 运营端-返回element ui - tree 结构agency列表 + * @param customerId + * @return com.epmet.dto.result.AgencyElementTreeResultDTO + * @Author liushaowen + * @Date 2020/11/6 14:02 + */ + AgencyElementTreeResultDTO getAgencyElementTree(String customerId); + /** * @Description 对外接口-根据组织Id获取组织信息 * @author sun @@ -225,13 +234,4 @@ public interface CustomerAgencyService extends BaseService * @author sun **/ OrganizeTreeResultDTO organizeTree(String agencyId); - - /** - * @Description 运营端-返回element ui - tree 结构agency列表 - * @param customerId - * @return com.epmet.dto.result.AgencyElementTreeResultDTO - * @Author liushaowen - * @Date 2020/11/6 14:02 - */ - AgencyElementTreeResultDTO getAgencyElementTree(String customerId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 6b46f62d78..bc91668e7c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -994,6 +994,33 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyList = baseDao.getAgencyElementTree(customerId, "0"); + Set defaultKeys = new HashSet<>(); + traversalAgencyList(agencyList,0,defaultKeys); + AgencyElementTreeResultDTO dto = new AgencyElementTreeResultDTO(); + dto.setList(agencyList); + dto.setDefaultKeys(defaultKeys); + return dto; + } + private void traversalAgencyList(List agencyList,int times,Set set){ + if (agencyList.size() > 0 && times < 2){ + for (AgencyElementTreeResultDTO.Agency list : agencyList) { + set.add(list.getId()); + times++; + traversalAgencyList(list.getChildren(),times,set); + } + } + } + /** * @Description 对外接口-根据组织Id获取组织信息 * @author sun @@ -1030,31 +1057,4 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyList = baseDao.getAgencyElementTree(customerId, "0"); - Set defaultKeys = new HashSet<>(); - traversalAgencyList(agencyList,0,defaultKeys); - AgencyElementTreeResultDTO dto = new AgencyElementTreeResultDTO(); - dto.setList(agencyList); - dto.setDefaultKeys(defaultKeys); - return dto; - } - private void traversalAgencyList(List agencyList,int times,Set set){ - if (agencyList.size() > 0 && times < 2){ - for (AgencyElementTreeResultDTO.Agency list : agencyList) { - set.add(list.getId()); - times++; - traversalAgencyList(list.getChildren(),times,set); - } - } - } - } \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 14117402a9..55bbfcd18f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -221,11 +221,6 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", formDTO); } - @Override - public Result getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO); - } - @Override public Result editUserInfo(EditInfoFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "editUserInfo", formDTO); @@ -250,4 +245,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result openedOrClosed(OpenedOrClosedFormDTO openedOrClosedFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "openedOrClosed", openedOrClosedFormDTO); } + + @Override + public Result getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO); + } }