Merge remote-tracking branch 'remotes/origin/dev_personal_center' into dev_temp

# Conflicts:
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

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;
 

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<StaffInAgencyListResultDTO>().ok(customerAgencyService.staffInAgencyList(tokenDTO.getUserId()));
     }
 
-    /**
-     * @Description 对外接口-根据组织Id获取组织信息
-     * @author sun
-     **/
-    @PostMapping("agencyinfo")
-    Result<AgencyInfoResultDTO> agencyInfo(@RequestBody AgencyInfoFormDTO formDTO) {
-        return new Result<AgencyInfoResultDTO>().ok(customerAgencyService.agencyInfo(formDTO));
-    }
-
-    /**
-     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
-     * @author sun
-     **/
-    @PostMapping("organizetree/{agencyId}")
-    Result<OrganizeTreeResultDTO> organizeTree(@PathVariable("agencyId") String agencyId) {
-        return new Result<OrganizeTreeResultDTO>().ok(customerAgencyService.organizeTree(agencyId));
-    }
-
     /**
      * @Description 对外接口，根据customerId返回Element UI中Tree结构的agency列表
      * @param map
@@ -297,4 +279,22 @@ public class CustomerAgencyController {
         }
         return new Result<Set<String>>().ok(customerAgencyService.getAgencyElementTree(customerId).getDefaultKeys());
     }
+
+    /**
+     * @Description 对外接口-根据组织Id获取组织信息
+     * @author sun
+     **/
+    @PostMapping("agencyinfo")
+    Result<AgencyInfoResultDTO> agencyInfo(@RequestBody AgencyInfoFormDTO formDTO) {
+        return new Result<AgencyInfoResultDTO>().ok(customerAgencyService.agencyInfo(formDTO));
+    }
+
+    /**
+     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+     * @author sun
+     **/
+    @PostMapping("organizetree/{agencyId}")
+    Result<OrganizeTreeResultDTO> organizeTree(@PathVariable("agencyId") String agencyId) {
+        return new Result<OrganizeTreeResultDTO>().ok(customerAgencyService.organizeTree(agencyId));
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -176,6 +176,16 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      **/
     AgencyResultDTO selectAgencyByStaffId(@Param("staffId") String staffId);
 
+    /**
+     * @Description 返回elementTree结构的agency树
+     * @param customerId
+     * @param pid
+     * @return java.util.List<com.epmet.dto.result.AgencyElementTreeResultDTO.Agency>
+     * @Author liushaowen
+     * @Date 2020/11/6 14:57
+     */
+    List<AgencyElementTreeResultDTO.Agency> getAgencyElementTree(@Param("customerId") String customerId,@Param("pid") String pid);
+
     /**
      * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
      * @author sun
@@ -196,14 +206,4 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author sun
      **/
     List<OrganizeTreeResultDTO> selectAllSub(@Param("agencyId") String agencyId);
-
-    /**
-     * @Description 返回elementTree结构的agency树
-     * @param customerId
-     * @param pid
-     * @return java.util.List<com.epmet.dto.result.AgencyElementTreeResultDTO.Agency>
-     * @Author liushaowen
-     * @Date 2020/11/6 14:57
-     */
-    List<AgencyElementTreeResultDTO.Agency> getAgencyElementTree(@Param("customerId") String customerId,@Param("pid") String pid);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java

@@ -214,6 +214,15 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      **/
     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<CustomerAgencyEntity>
      * @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);
 }

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<CustomerAgencyDao
         return resultDTO;
     }
 
+    /**
+     * @param customerId
+     * @return com.epmet.dto.result.AgencyElementTreeResultDTO
+     * @Description 运营端-返回element ui - tree 结构agency列表
+     * @Author liushaowen
+     * @Date 2020/11/6 14:02
+     */
+    @Override
+    public AgencyElementTreeResultDTO getAgencyElementTree(String customerId) {
+        List<AgencyElementTreeResultDTO.Agency> agencyList = baseDao.getAgencyElementTree(customerId, "0");
+        Set<String> defaultKeys = new HashSet<>();
+        traversalAgencyList(agencyList,0,defaultKeys);
+        AgencyElementTreeResultDTO dto = new AgencyElementTreeResultDTO();
+        dto.setList(agencyList);
+        dto.setDefaultKeys(defaultKeys);
+        return dto;
+    }
+    private void traversalAgencyList(List<AgencyElementTreeResultDTO.Agency> agencyList,int times,Set<String> 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<CustomerAgencyDao
         return baseDao.selectorganizeTree(agencyId);
     }
 
-    /**
-     * @param customerId
-     * @return com.epmet.dto.result.AgencyElementTreeResultDTO
-     * @Description 运营端-返回element ui - tree 结构agency列表
-     * @Author liushaowen
-     * @Date 2020/11/6 14:02
-     */
-    @Override
-    public AgencyElementTreeResultDTO getAgencyElementTree(String customerId) {
-        List<AgencyElementTreeResultDTO.Agency> agencyList = baseDao.getAgencyElementTree(customerId, "0");
-        Set<String> defaultKeys = new HashSet<>();
-        traversalAgencyList(agencyList,0,defaultKeys);
-        AgencyElementTreeResultDTO dto = new AgencyElementTreeResultDTO();
-        dto.setList(agencyList);
-        dto.setDefaultKeys(defaultKeys);
-        return dto;
-    }
-    private void traversalAgencyList(List<AgencyElementTreeResultDTO.Agency> agencyList,int times,Set<String> set){
-        if (agencyList.size() > 0 && times < 2){
-            for (AgencyElementTreeResultDTO.Agency list : agencyList) {
-                set.add(list.getId());
-                times++;
-                traversalAgencyList(list.getChildren(),times,set);
-            }
-        }
-    }
-
 }

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<BasicInfoResultDTO> 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<BasicInfoResultDTO> getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO);
+    }
 }