Browse Source

合并分支

feature/teamB_zz_wgh
YUJT 3 years ago
parent
commit
a70864dadf
  1. 45
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/NodeTree.java
  2. 31
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/NodeTreeUtils.java
  3. 39
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAddressBookTreeResultDTO.java
  4. 32
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
  5. 18
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
  6. 23
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
  7. 35
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
  8. 55
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
  9. 19
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

45
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/NodeTree.java

@ -0,0 +1,45 @@
package com.epmet.commons.tools.utils;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
public class NodeTree<T> implements Serializable {
private static final long serialVersionUID = 8020505121785861117L;
/**
* 主键
*/
private String id;
/**
* 上级ID
*/
private String pid;
/**
* 子节点列表
*/
private List<T> children = new ArrayList<>();
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getPid() {
return pid;
}
public void setPid(String pid) {
this.pid = pid;
}
public List<T> getChildren() {
return children;
}
public void setChildren(List<T> children) {
this.children = children;
}
}

31
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/NodeTreeUtils.java

@ -0,0 +1,31 @@
package com.epmet.commons.tools.utils;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
public class NodeTreeUtils {
public static <T extends NodeTree> List<T> build(List<T> treeNodes) {
List<T> result = new ArrayList<>();
//list转map
Map<String, T> nodeMap = new LinkedHashMap<>(treeNodes.size());
for(T treeNode : treeNodes){
nodeMap.put(treeNode.getId(), treeNode);
}
for(T node : nodeMap.values()) {
T parent = nodeMap.get(node.getPid());
if(parent != null && !(node.getId().equals(parent.getId()))){
parent.getChildren().add(node);
continue;
}
result.add(node);
}
return result;
}
}

39
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAddressBookTreeResultDTO.java

@ -0,0 +1,39 @@
package com.epmet.dto.result;
import com.epmet.commons.tools.utils.NodeTree;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class AgencyAddressBookTreeResultDTO extends NodeTree implements Serializable {
private static final long serialVersionUID = -1993037593855768962L;
/**
* 父id
*/
private String pid;
/**
* 名字
*/
private String name;
/**
* 级别
*/
private String level;
/**
* 创建时间
*/
private Date createTime;
}

32
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@ -141,6 +141,7 @@ public class AgencyController {
/**
* 添加根级组织
*
* @param form
* @return
*/
@ -245,6 +246,7 @@ public class AgencyController {
/**
* 根据Id查询agency
*
* @param agencyId
* @return
*/
@ -259,6 +261,7 @@ public class AgencyController {
/**
* 根据staffId查询
*
* @param staffId
* @return
*/
@ -275,6 +278,7 @@ public class AgencyController {
/**
* 查询客户根级组织
*
* @param customerId
* @return
*/
@ -286,6 +290,7 @@ public class AgencyController {
/**
* 批量查询客户根级组织
*
* @param customerIds
* @return
*/
@ -324,8 +329,8 @@ public class AgencyController {
}
/**
* @Description 地图配置删除
* @param formDTO
* @Description 地图配置删除
* @author zxc
* @date 2021/10/25 9:30 上午
*/
@ -337,8 +342,8 @@ public class AgencyController {
}
/**
* @Description 地图配置新增
* @param formDTO
* @Description 地图配置新增
* @author zxc
* @date 2021/10/25 9:58 上午
*/
@ -350,9 +355,9 @@ public class AgencyController {
}
/**
* @Description 地图配置组织查询
* @param formDTO
* @param tokenDto
* @Description 地图配置组织查询
* @author zxc
* @date 2021/10/25 10:50 上午
*/
@ -362,8 +367,8 @@ public class AgencyController {
}
/**
* @Description 查询楼栋信息
* @param formDTO
* @Description 查询楼栋信息
* @author zxc
* @date 2021/11/2 9:18 上午
*/
@ -374,8 +379,8 @@ public class AgencyController {
}
/**
* @Description 查询下级agencyId
* @param orgId
* @Description 查询下级agencyId
* @author zxc
* @date 2021/12/9 4:42 下午
*/
@ -386,6 +391,7 @@ public class AgencyController {
/**
* Desc: 生成某类型下的二维码
*
* @param formDTO
* @author zxc
* @date 2022/3/2 10:32 上午
@ -451,6 +457,7 @@ public class AgencyController {
/**
* Desc: 查询工作人员所属组织下的所有社区
*
* @param tokenDto
* @author zxc
* @date 2022/3/21 15:13
@ -459,4 +466,19 @@ public class AgencyController {
public Result<List<CommunityListResultDTO>> getCommunityList(@LoginUser TokenDto tokenDto) {
return new Result<List<CommunityListResultDTO>>().ok(agencyService.getCommunityList(tokenDto));
}
/**
* 通讯录树状结构
*
* @param name
* @param tokenDto
* @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.AgencyAddressBookTreeResultDTO>>
* @author LZN
* @date 2022/5/16 10:42
*/
@GetMapping("/orgtree/{name}/{customerId}")
public Result<List<AgencyAddressBookTreeResultDTO>> getAddressTree(@PathVariable String name, @PathVariable String customerId) {
List<AgencyAddressBookTreeResultDTO> dto = agencyService.getAddressTree(name, customerId);
return new Result<List<AgencyAddressBookTreeResultDTO>>().ok(dto);
}
}

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

@ -296,10 +296,12 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
/**
* desc:获取组织和网格的数据 树形sql
*
* @param agencyId
* @return
*/
ExtStaffPermissionResultDTO selectAgencyAndGridById(@Param("agencyId") String agencyId);
/**
* @Description 事件社区服务热线
* @author sun
@ -310,6 +312,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
/**
* Desc: 查询组织下的社区
*
* @param customerId
* @param agencyId
* @author zxc
@ -318,13 +321,26 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
List<CommunityListResultDTO> getCommunityList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
List<SubOrgResDTO> selectSubOrg(String agencyId);
/**
* @return java.util.List<com.epmet.dto.result.PartyOrgTreeResultDTO>
* @describe: 通过用户所属的行政组织和行政类型查询下级的组织树
* @author wangtong
* @date 2022/5/18 17:23
* @params [formDto]
* @return java.util.List<com.epmet.dto.result.PartyOrgTreeResultDTO>
*/
List<PartyOrgTreeResultDTO> getOrgTreeByUserAndType(OrgTreeByUserAndTypeFormDTO formDto);
/**
* 通讯录树
*
* @param name
* @param customerId
* @return java.util.List<com.epmet.dto.result.AgencyAddressBookTreeResultDTO>
* @author LZN
* @date 2022/5/16 10:44
*/
List<AgencyAddressBookTreeResultDTO> getAddressTree(@Param("name") String name,
@Param("customerId") String customerId);
}

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

@ -66,6 +66,7 @@ public interface AgencyService {
/**
* 根据Id查询
*
* @param agencyId
* @return
*/
@ -75,6 +76,7 @@ public interface AgencyService {
/**
* 查询客户根级组织
*
* @param customerId
*/
CustomerAgencyDTO getCustomerRootAgency(String customerId);
@ -99,41 +101,41 @@ public interface AgencyService {
AddAgencyResultDTO addAgencyV2(AddAgencyV2FormDTO formDTO);
/**
* @Description 地图配置删除
* @param formDTO
* @Description 地图配置删除
* @author zxc
* @date 2021/10/25 9:30 上午
*/
void mapDelArea(MapDelAreaFormDTO formDTO);
/**
* @Description 地图配置新增
* @param formDTO
* @Description 地图配置新增
* @author zxc
* @date 2021/10/25 9:58 上午
*/
void mapAddArea(MapAddAreaFormDTO formDTO);
/**
* @Description 地图配置组织查询
* @param formDTO
* @param tokenDto
* @Description 地图配置组织查询
* @author zxc
* @date 2021/10/25 10:50 上午
*/
MapOrgResultDTO mapOrg(MapOrgFormDTO formDTO, TokenDto tokenDto);
/**
* @Description 查询楼栋信息
* @param formDTO
* @Description 查询楼栋信息
* @author zxc
* @date 2021/11/2 9:18 上午
*/
List<BaseInfoFamilyBuildingResultDTO> baseInfoFamilyBuilding(BaseInfoFamilyBuildingFormDTO formDTO);
/**
* @Description 查询下级agencyId
* @param orgId
* @Description 查询下级agencyId
* @author zxc
* @date 2021/12/9 4:42 下午
*/
@ -141,10 +143,21 @@ public interface AgencyService {
/**
* Desc: 查询工作人员所属组织下的所有社区
*
* @param tokenDto
* @author zxc
* @date 2022/3/21 15:13
*/
List<CommunityListResultDTO> getCommunityList(TokenDto tokenDto);
/**
* 通讯录树状结构
*
* @param name
* @param customerId
* @return java.util.List<com.epmet.dto.result.AgencyAddressBookTreeResultDTO>
* @author LZN
* @date 2022/5/16 10:43
*/
List<AgencyAddressBookTreeResultDTO> getAddressTree(String name, String customerId);
}

35
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@ -33,6 +33,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.NodeTreeUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.CustomerAgencyConstant;
import com.epmet.constant.OrgInfoConstant;
@ -243,6 +244,7 @@ public class AgencyServiceImpl implements AgencyService {
/**
* 所有下家组织网格部门的area_codeparent_area_code置为空
* 直属组织parent_area_code直属网格+直属部门的area_code更新为最新值
*
* @param customerId
* @param formDTO
* @param originalAreaCode
@ -284,7 +286,6 @@ public class AgencyServiceImpl implements AgencyService {
}
/**
*
* @param formDTO 编辑组织入参
* @param parent 当前编辑组织的上级组织
* @return 返回组织区划编码
@ -320,6 +321,7 @@ public class AgencyServiceImpl implements AgencyService {
/**
* 如果当前客户开启了areaCode校验参数逼单
*
* @param formDTO
*/
private void checkEditAgencyFormDTO(EditAgencyFormDTO formDTO, CustomerAgencyEntity originalEntity) {
@ -691,8 +693,8 @@ public class AgencyServiceImpl implements AgencyService {
}
/**
* @Description 地图配置删除
* @param formDTO
* @Description 地图配置删除
* @author zxc
* @date 2021/10/25 9:30 上午
*/
@ -702,8 +704,8 @@ public class AgencyServiceImpl implements AgencyService {
}
/**
* @Description 地图配置新增
* @param formDTO
* @Description 地图配置新增
* @author zxc
* @date 2021/10/25 9:58 上午
*/
@ -713,14 +715,14 @@ public class AgencyServiceImpl implements AgencyService {
}
/**
* @param formDTO
* @param tokenDto
* @Description 地图配置组织查询
* 根据level查询去查询不同的表类型组织agency网格grid小区neighborHood
* 组织类型去查 customer_agency看本级是不是 community下级组织就是网格查询customer_grid不是继续查customer_agency
* 网格类型去查 查询customer_grid下级去查 ic_neighbor_hood
* 当前组织没有经纬度的话直接赋值根组织的经纬度
* 下级组织经纬度为空的话直接赋值上级的经纬度
* @param formDTO
* @param tokenDto
* @author zxc
* @date 2021/10/25 10:50 上午
*/
@ -810,8 +812,8 @@ public class AgencyServiceImpl implements AgencyService {
}
/**
* @Description 查询楼栋信息
* @param formDTO
* @Description 查询楼栋信息
* @author zxc
* @date 2021/11/2 9:18 上午
*/
@ -825,8 +827,8 @@ public class AgencyServiceImpl implements AgencyService {
}
/**
* @Description 查询下级agencyId
* @param orgId
* @Description 查询下级agencyId
* @author zxc
* @date 2021/12/9 4:42 下午
*/
@ -846,6 +848,7 @@ public class AgencyServiceImpl implements AgencyService {
/**
* Desc: 查询工作人员所属组织下的所有社区
*
* @param tokenDto
* @author zxc
* @date 2022/3/21 15:13
@ -867,6 +870,21 @@ public class AgencyServiceImpl implements AgencyService {
return customerAgencyDao.getCommunityList(tokenDto.getCustomerId(), agencyId);
}
/**
* 通讯录树
*
* @param name
* @param customerId
* @return java.util.List<com.epmet.dto.result.AgencyAddressBookTreeResultDTO>
* @author LZN
* @date 2022/5/16 10:45
*/
@Override
public List<AgencyAddressBookTreeResultDTO> getAddressTree(String name, String customerId) {
List<AgencyAddressBookTreeResultDTO> list = customerAgencyDao.getAddressTree(name, customerId);
return NodeTreeUtils.build(list);
}
private CustomerAgencyEntity constructInsertEntity(AddAgencyV2FormDTO formDTO, CustomerAgencyDTO parent) {
CustomerAgencyEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class);
insertEntity.setOrganizationName(formDTO.getAgencyName());
@ -882,8 +900,7 @@ public class AgencyServiceImpl implements AgencyService {
insertEntity.setPids(parent.getPids().concat(StrConstant.COLON).concat(parent.getId()));
insertEntity.setAllParentName(parent.getAllParentName().concat(StrConstant.HYPHEN).concat(parent.getOrganizationName()));
}
switch(parent.getLevel())
{
switch (parent.getLevel()) {
case CustomerAgencyConstant.PROVINCE_LEVEL:
insertEntity.setLevel(CustomerAgencyConstant.CITY_LEVEL);
insertEntity.setProvince(parent.getProvince());

55
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@ -744,6 +744,61 @@
AND CUSTOMER_ID = #{customerId}
AND CONCAT(PIDS,':',ID) LIKE CONCAT('%',#{agencyId},'%')
</select>
<select id="getAddressTree" resultType="com.epmet.dto.result.AgencyAddressBookTreeResultDTO">
SELECT
a.id,
a.pid,
a.ORGANIZATION_NAME AS NAME,
a.CREATED_TIME,
a.LEVEL
FROM
customer_agency a
<where>
a.DEL_FLAG = '0'
<if test="customerId != null and customerId != ''">
AND a.CUSTOMER_ID = #{customerId}
</if>
<if test="name != null and name != ''">
AND a.ORGANIZATION_NAME LIKE '%${name}%'
</if>
</where>
UNION ALL
SELECT
d.id,
d.AGENCY_ID AS pid,
d.DEPARTMENT_NAME AS NAME,
d.CREATED_TIME,
0 AS LEVEL
FROM
customer_department d
<where>
d.DEL_FLAG = '0'
<if test="customerId != null and customerId != ''">
AND d.CUSTOMER_ID = #{customerId}
</if>
<if test="name != null and name != ''">
AND d.DEPARTMENT_NAME LIKE '%${name}%'
</if>
</where>
UNION ALL
SELECT
g.id,
g.pid,
g.GRID_NAME AS NAME,
g.CREATED_TIME,
0 AS LEVEL
FROM
customer_grid g
<where>
g.DEL_FLAG = '0'
<if test="customerId != null and customerId != ''">
AND g.CUSTOMER_ID = #{customerId}
</if>
<if test="name != null and name != ''">
AND g.GRID_NAME LIKE '%${name}%'
</if>
</where>
</select>
<update id="updateSubAgencyAreaCodeById" parameterType="map">
UPDATE customer_agency

19
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@ -36,7 +36,6 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
import com.epmet.commons.tools.security.password.PasswordUtils;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.CpUserDetailRedis;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.CustomerStaffConstant;
import com.epmet.constant.RoleKeyConstants;
@ -53,7 +52,6 @@ import com.epmet.entity.GovStaffRoleEntity;
import com.epmet.entity.StaffRoleEntity;
import com.epmet.entity.UserEntity;
import com.epmet.feign.AuthFeignClient;
import com.epmet.feign.EpmetMessageOpenFeignClient;
import com.epmet.feign.GovOrgOpenFeignClient;
import com.epmet.feign.OperCrmOpenFeignClient;
import com.epmet.service.CustomerStaffService;
@ -92,19 +90,13 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
@Autowired
private StaffRoleDao staffRoleDao;
@Autowired
private CpUserDetailRedis cpUserDetailRedis;
@Autowired
private AuthFeignClient authFeignClient;
@Autowired
private GovOrgOpenFeignClient govOrgOpenFeignClient;
@Autowired
private CustomerStaffDao customerStaffDao;
@Autowired
private GovStaffRoleDao govStaffRoleDao;
@Autowired
private OperCrmOpenFeignClient operCrmOpenFeignClient;
@Autowired
private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
@Override
public PageData<CustomerStaffDTO> page(Map<String, Object> params) {
@ -324,6 +316,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
staffEntity.setGender(fromDTO.getGender());
staffEntity.setWorkType(fromDTO.getWorkType());
staffEntity.setEnableFlag(CustomerStaffConstant.ENABLE);
staffEntity.setPassword(PasswordUtils.encode("12345678"));
baseDao.insert(staffEntity);
//工作人员角色关联表
@ -553,9 +546,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
}
/**
* @Description 得到工组人员的头像名称所属机关名称
* @param userId
* @return
* @Description 得到工组人员的头像名称所属机关名称
* @author wangc
* @date 2020.07.27 14:45
**/
@ -594,8 +587,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
}
/**
* @Description 查询工作人员的信息
* @param formDTO
* @Description 查询工作人员的信息
* @author zxc
* @date 2020/8/13 1:45 下午
*/
@ -649,9 +642,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
/**
* @Description 查找工作人员的信息 - 对外开放接口
* @param staffParam
* @return
* @Description 查找工作人员的信息 - 对外开放接口
* @author wangc
* @date 2020.08.17 10:30
**/
@ -779,8 +772,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
/**
* 根据staffId查询用户基本信息
* @author sun
*
* @return
* @author sun
*/
@Override
public BasicInfoResultDTO getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
@ -794,6 +788,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
/**
* 通讯录工作人员解禁
*
* @author sun
*/
@Override

Loading…
Cancel
Save