From 62bff6e22b87c864199df86e63e0453695b5e7d5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 12 Dec 2022 14:06:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=94=A8=E6=88=B7=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-admin/pom.xml | 6 + .../epdc/controller/SysDeptController.java | 19 +++ .../elink/esua/epdc/dao/SysDeptInfoDao.java | 5 +- .../elink/esua/epdc/entity/SysUserEntity.java | 5 + .../esua/epdc/service/SysDeptInfoService.java | 13 +- .../service/impl/SysDeptInfoServiceImpl.java | 9 +- .../epdc/service/impl/SysUserServiceImpl.java | 127 ++++++++++++++++++ .../main/resources/mapper/SysDeptInfoDao.xml | 18 ++- 8 files changed, 198 insertions(+), 4 deletions(-) diff --git a/epdc-cloud-admin/pom.xml b/epdc-cloud-admin/pom.xml index ea01dbb..bf5fb93 100644 --- a/epdc-cloud-admin/pom.xml +++ b/epdc-cloud-admin/pom.xml @@ -114,6 +114,12 @@ 1.0.0 compile + + com.esua.epdc.yushan + epdc-cloud-admin-client + 1.0.0 + compile + diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 34e61f2..db1255e 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -28,7 +28,9 @@ import com.elink.esua.epdc.dto.form.DeptInfoFormDTO; import com.elink.esua.epdc.dto.management.form.CommunityAddFormDTO; import com.elink.esua.epdc.dto.management.result.GlobalResultDTO; import com.elink.esua.epdc.dto.result.DeptInfoResultDTO; +import com.elink.esua.epdc.dto.result.SysDeptInfoResultDTO; import com.elink.esua.epdc.optimize.modules.deptlevel.service.OptSysDeptService; +import com.elink.esua.epdc.service.SysDeptInfoService; import com.elink.esua.epdc.service.SysDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -55,6 +57,9 @@ public class SysDeptController { @Autowired private SysDeptService sysDeptService; + @Autowired + private SysDeptInfoService sysDeptInfoService; + @Autowired private OptSysDeptService optSysDeptService; @@ -442,6 +447,20 @@ public class SysDeptController { return new Result().ok(data); } + /** + * 通过部门ID所有上级机构 + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author wgf + * @date 2022/12/9 09:12 + */ + @GetMapping("getSysDeptInfoByDeptId/{deptId}") + public Result getSysDeptInfoByDeptId(@PathVariable("deptId") String deptId) { + SysDeptInfoResultDTO sysDeptInfoDTO = sysDeptInfoService.getSysDeptInfo(deptId); + return new Result().ok(sysDeptInfoDTO); + } + /** * 推送社区管理信息 * diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java index 4961a90..4be286e 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.AppDeptInfoResultDTO; +import com.elink.esua.epdc.dto.result.SysDeptInfoResultDTO; import com.elink.esua.epdc.entity.SysDeptInfoEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -40,4 +41,6 @@ public interface SysDeptInfoDao extends BaseDao { * @return com.elink.esua.epdc.dto.AppDeptInfoResultDTO */ AppDeptInfoResultDTO selectByDeptId(@Param("deptId") Long deptId); -} \ No newline at end of file + + SysDeptInfoResultDTO getSysDeptInfo(@Param("deptId") String deptId); +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java index 494dbff..25c12e9 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java @@ -119,4 +119,9 @@ public class SysUserEntity extends BaseEntity { */ private String verifyMobile; + /** + * 社区管理第三方ID + */ + private Integer manageId; + } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.java index 25c4054..a153ca5 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.SysDeptInfoDTO; +import com.elink.esua.epdc.dto.result.SysDeptInfoResultDTO; import com.elink.esua.epdc.entity.SysDeptInfoEntity; import java.util.List; @@ -103,4 +104,14 @@ public interface SysDeptInfoService extends BaseService { */ SysDeptInfoDTO getDeptInfoByDeptID(String deptId); -} \ No newline at end of file + /** + * 单条查询 + * + * @param deptId + * @return SysDeptInfoDTO + * @author generator + * @date 2021-08-10 + */ + SysDeptInfoResultDTO getSysDeptInfo(String deptId); + +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.java index 1034986..fb74525 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.dao.SysDeptInfoDao; import com.elink.esua.epdc.dto.SysDeptInfoDTO; +import com.elink.esua.epdc.dto.result.SysDeptInfoResultDTO; import com.elink.esua.epdc.entity.SysDeptInfoEntity; import com.elink.esua.epdc.service.SysDeptInfoService; import org.apache.commons.lang3.StringUtils; @@ -106,4 +107,10 @@ public class SysDeptInfoServiceImpl extends BaseServiceImpl implements SysUserService { @Autowired private SysRoleUserService sysRoleUserService; @Autowired private SysDeptService sysDeptService; @Autowired + private SysDeptInfoService sysDeptInfoService; + @Autowired private SysPropertyUserService sysPropertyUserService; @Autowired private SysEpmetUserRelationService sysEpmetUserRelationService; + @Autowired + private CommunityManageFeignClient communityManageFeignClient; + @Override public PageData page(Map params) { @@ -129,6 +140,9 @@ public class SysUserServiceImpl extends BaseServiceImpl result = communityManageFeignClient.addManageUser(userAddFormDTO); + log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserAdd result:" + result); + communityManageHandle(result, dto, entity); + } + } else if (type == NumConstant.ONE) { + SysUserEntity userEntity = baseDao.selectById(dto.getId()); + if (userEntity != null && userEntity.getManageId() != null) { + ManageUserUpdFormDTO userUpdFormDTO = new ManageUserUpdFormDTO(); + + userUpdFormDTO.setUserName(entity.getUsername()); + userUpdFormDTO.setGender(entity.getGender() == null ? "" : entity.getGender().toString()); + userUpdFormDTO.setBornTime(""); + userUpdFormDTO.setWorkDate(""); + userUpdFormDTO.setHeadImage(entity.getHeadUrl()); + userUpdFormDTO.setIntroduction(entity.getRemark()); + userUpdFormDTO.setDescription(""); + userUpdFormDTO.setId(userEntity.getManageId()); + userUpdFormDTO.setGridId(sysDeptInfoResultDTO.getGridManageId()); + + log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserUpdFormDTO:" + userUpdFormDTO); + Result result = communityManageFeignClient.updManageUser(userUpdFormDTO); + log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserupd result:" + result); + communityManageHandle(result, dto, entity); + } + } else if (type == NumConstant.TWO) { + SysUserEntity userEntity = baseDao.selectById(dto.getId()); + if (userEntity != null && userEntity.getManageId() != null) { + ManageUserDelFormDTO userDelFormDTO = new ManageUserDelFormDTO(); + userDelFormDTO.setId(userEntity.getManageId()); + log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserDelFormDTO:" + userDelFormDTO); + Result result = communityManageFeignClient.delManageUser(userDelFormDTO); + log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserDel result:" + result); +// communityManageHandle(result, dto, entity); + } + } + } catch (Exception e) { + log.error("推送社区管理接口失败：type>>" + type + "||id>>" + entity.getId()); + } + } + + /** + * 设置ManageId + * @param result + * @param dto + * @param entity + */ + private void communityManageHandle(Result result, SysUserDTO dto, SysUserEntity entity) { + if (result.success()) { + Object resultObject = result.getData().getResult(); + Integer mId = null; + // 只有新增操作result才会有值，编辑删除是null，直接通过这个来判断是不是新增操作 + if (resultObject != null) { + mId = Integer.valueOf(resultObject.toString()); + } + SysUserEntity userEntity = baseDao.selectById(entity.getId()); + // 表里没有直接插入 + if (userEntity == null) { + // 插入信息表 + SysUserEntity addUserEntity = ConvertUtils.sourceToTarget(dto, SysUserEntity.class); + addUserEntity.setManageId(mId); + baseDao.insert(addUserEntity); + } else { + // 更新信息表 + userEntity.setManageId(mId); + baseDao.updateById(userEntity); + } + } + + } + } diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml index 216a781..cbe7f24 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml @@ -27,6 +27,22 @@ where DEL_FLAG='0' and DEPT_ID=#{deptId} + + + +