diff --git a/epdc-cloud-admin/pom.xml b/epdc-cloud-admin/pom.xml
index 572c3cc..32120fe 100644
--- a/epdc-cloud-admin/pom.xml
+++ b/epdc-cloud-admin/pom.xml
@@ -180,15 +180,15 @@
dev
8
- r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com
- 10001
- elink!888
+ r-v0l694084401a044pd.redis.rds.aliyuncs.com
+ 6379
+ CJ!redis@elink
false
- 115.29.142.202:8848
+ 47.104.92.53:8848
- 8831513c-2f72-42e8-899f-eb6c2c5ae110
+ 33672684-31a6-4550-9586-7f0317b85196
http://localhost:9411
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 59b3aa5..34e61f2 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
@@ -25,6 +25,8 @@ import com.elink.esua.epdc.dto.epdc.form.UserSysDeptAreaCodeFormDTO;
import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
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.optimize.modules.deptlevel.service.OptSysDeptService;
import com.elink.esua.epdc.service.SysDeptService;
@@ -121,7 +123,7 @@ public class SysDeptController {
public Result delete(@PathVariable("id") Long id) {
//效验数据
AssertUtils.isNull(id, "id");
-// sysDeptService.delete(id);
+ sysDeptService.beforeDelete(id);
sysDeptService.deleteBatchIds(Arrays.asList(new Long[]{id}));
return new Result();
}
@@ -432,4 +434,26 @@ public class SysDeptController {
return new Result().ok(data);
}
+ @GetMapping("deptinfo/{id}")
+ @ApiOperation("信息")
+ public Result getDeptInfo(@PathVariable("id") Long id) {
+ DeptInfoDTO data = sysDeptService.getDeptInfoById(id);
+
+ return new Result().ok(data);
+ }
+
+ /**
+ * 推送社区管理信息
+ *
+ * @param
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author zhy
+ * @date 2022/12/9 10:31
+ */
+ @PostMapping("manage/sendManageDept")
+ public Result sendManageDept() {
+ sysDeptService.sendManageDept();
+ return new Result();
+ }
+
}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
index 6aba940..363fcc3 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
@@ -240,4 +240,6 @@ public interface SysDeptDao extends BaseDao {
*/
AllDeptDTO getDeptInfoByName(@Param("gridName") String gridName);
+ List getManageDept();
+
}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java
index 606790c..4176ff7 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java
@@ -88,4 +88,9 @@ public class SysDeptInfoEntity extends BaseEpdcEntity {
*/
private Integer communityManNum;
+ /**
+ * 社区管理第三方ID
+ */
+ private Integer manageId;
+
}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
index 129e5d0..7250088 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
@@ -37,6 +37,8 @@ public interface SysDeptService extends BaseService {
SysDeptDTO get(Long id);
+ DeptInfoDTO getDeptInfoById(Long id);
+
void save(SysDeptDTO dto);
void update(SysDeptDTO dto);
@@ -326,4 +328,16 @@ public interface SysDeptService extends BaseService {
*/
AllDeptDTO getAllDeptInfoByName(String gridName);
+ /**
+ * 删除前处理
+ *
+ * @param id
+ * @return void
+ * @author zhy
+ * @date 2022/12/8 14:20
+ */
+ void beforeDelete(Long id);
+
+ void sendManageDept();
+
}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index a5c7d2a..6c215ce 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
import com.elink.esua.epdc.constant.ImgConstant;
@@ -45,11 +46,14 @@ import com.elink.esua.epdc.dto.epdc.result.AreaCodeParentResultDTO;
import com.elink.esua.epdc.dto.epdc.result.UserSysDeptAreaCodeResultDTO;
import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
import com.elink.esua.epdc.dto.form.DeptInfoFormDTO;
+import com.elink.esua.epdc.dto.management.form.*;
+import com.elink.esua.epdc.dto.management.result.GlobalResultDTO;
import com.elink.esua.epdc.dto.result.DeptInfoResultDTO;
import com.elink.esua.epdc.entity.AdminImgEntity;
import com.elink.esua.epdc.entity.SysDeptEntity;
import com.elink.esua.epdc.entity.SysDeptInfoEntity;
import com.elink.esua.epdc.feign.AnalysisFeignClient;
+import com.elink.esua.epdc.feign.CommunityManageFeignClient;
import com.elink.esua.epdc.feign.GroupFeignClient;
import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
import com.elink.esua.epdc.rocketmq.producer.OrganizationModifyProducer;
@@ -67,6 +71,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 部门管理
@@ -83,6 +88,9 @@ public class SysDeptServiceImpl extends BaseServiceImpl completeDeptDtoResult = this.getCompleteDept(entity.getId().toString());
groupFeignClient.createPartyGroup(completeDeptDtoResult.getData());
}
+
}
private void insertInfo(SysDeptDTO dto, SysDeptEntity entity) {
@@ -239,6 +259,109 @@ public class SysDeptServiceImpl extends BaseServiceImpl result = communityManageFeignClient.addCommunity(communityAddFormDTO);
+ communityManageHandle(result, dto, entity);
+
+ } else if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dto.getTypeKey())) {
+ GridAddFormDTO gridAddFormDTO = new GridAddFormDTO();
+ gridAddFormDTO.setGridNum(entity.getName());
+ gridAddFormDTO.setCircleId(entity.getPid().intValue());
+ gridAddFormDTO.setCreateTime(entity.getCreateDate().toString());
+ gridAddFormDTO.setParentId(NumConstant.ZERO);
+ gridAddFormDTO.setLevel(NumConstant.ONE);
+ gridAddFormDTO.setGridDesc(dto.getIntroduction());
+ gridAddFormDTO.setOldGridId(entity.getId().toString());
+ Result result = communityManageFeignClient.addGrid(gridAddFormDTO);
+ communityManageHandle(result, dto, entity);
+ }
+ } else if (type == NumConstant.ONE) {
+ SysDeptInfoDTO sysDeptInfoDTO = sysDeptInfoService.getDeptInfoByDeptID(dto.getId().toString());
+ if (sysDeptInfoDTO != null && sysDeptInfoDTO.getManageId() != null) {
+ if (OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(dto.getTypeKey())) {
+ CommunityUpdFormDTO communityUpdFormDTO = new CommunityUpdFormDTO();
+ communityUpdFormDTO.setCircleName(entity.getName());
+ communityUpdFormDTO.setCircleDescribe(dto.getIntroduction());
+ communityUpdFormDTO.setMapX(dto.getLatitude());
+ communityUpdFormDTO.setMapY(dto.getLongitude());
+ communityUpdFormDTO.setCircleId(sysDeptInfoDTO.getManageId().toString());
+ Result result = communityManageFeignClient.updCommunity(communityUpdFormDTO);
+ communityManageHandle(result, dto, entity);
+ } else if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dto.getTypeKey())) {
+ GridUpdFormDTO gridUpdFormDTO = new GridUpdFormDTO();
+ gridUpdFormDTO.setGridNum(entity.getName());
+ gridUpdFormDTO.setGridDesc(dto.getIntroduction());
+ gridUpdFormDTO.setGridId(sysDeptInfoDTO.getManageId().toString());
+ Result result = communityManageFeignClient.updGrid(gridUpdFormDTO);
+ communityManageHandle(result, dto, entity);
+ }
+ }
+ } else if (type == NumConstant.TWO) {
+ SysDeptInfoDTO sysDeptInfoDTO = sysDeptInfoService.getDeptInfoByDeptID(dto.getId().toString());
+ if (sysDeptInfoDTO != null && sysDeptInfoDTO.getManageId() != null) {
+ if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dto.getTypeKey())) {
+ GridDelFormDTO gridDelFormDTO = new GridDelFormDTO();
+ gridDelFormDTO.setGridId(sysDeptInfoDTO.getManageId().toString());
+ Result result = communityManageFeignClient.delGrid(gridDelFormDTO);
+ communityManageHandle(result, dto, entity);
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("推送社区管理接口失败:type>>" + type + "||type_key>>" + dto.getTypeKey() + "||id>>" + entity.getId());
+ }
+ }
+
+ private void communityManageHandle(Result result, SysDeptDTO dto, SysDeptEntity entity) {
+ if (result.success()) {
+ Object resultObject = result.getData().getResult();
+ Integer mId = null;
+ if (resultObject != null) {
+ mId = Integer.valueOf(resultObject.toString());
+ }
+ SysDeptInfoDTO sysDeptInfoDTO = sysDeptInfoService.getDeptInfoByDeptID(entity.getId().toString());
+ // 表里没有直接插入
+ if (sysDeptInfoDTO == null) {
+ // 插入信息表
+ SysDeptInfoEntity sysDeptInfoEntity = ConvertUtils.sourceToTarget(dto, SysDeptInfoEntity.class);
+ sysDeptInfoEntity.setDeptId(entity.getId());
+ sysDeptInfoEntity.setManageId(mId);
+ sysDeptInfoService.insert(sysDeptInfoEntity);
+ } else {
+ // 更新信息表
+ SysDeptInfoDTO deptInfoDTO = ConvertUtils.sourceToTarget(dto, SysDeptInfoDTO.class);
+ deptInfoDTO.setDeptId(sysDeptInfoDTO.getDeptId());
+ deptInfoDTO.setId(sysDeptInfoDTO.getId());
+ deptInfoDTO.setManageId(mId);
+ sysDeptInfoService.update(deptInfoDTO);
+ }
+ }
+
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public void update(SysDeptDTO dto) {
@@ -268,6 +391,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl
+ * @return java.util.Map
* @author work@yujt.net.cn
* @date 2019/11/29 10:27
*/
@@ -1181,4 +1306,32 @@ public class SysDeptServiceImpl extends BaseServiceImpl list = baseDao.getManageDept();
+ List community = list.stream().filter(item -> OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(item.getTypeKey())).collect(Collectors.toList());
+ List grid = list.stream().filter(item -> OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(item.getTypeKey())).collect(Collectors.toList());
+ log.info("本次推送社区管理信息数量community>>" + community.size() + "||grid>>" + grid.size());
+ community.forEach(entity -> {
+ SysDeptDTO dto = ConvertUtils.sourceToTarget(entity, SysDeptDTO.class);
+ // 社区管理推送
+// sendInfo(dto, entity, 0);
+ });
+ grid.forEach(entity -> {
+ SysDeptDTO dto = ConvertUtils.sourceToTarget(entity, SysDeptDTO.class);
+ // 社区管理推送
+// sendInfo(dto, entity, 0);
+ });
+ }
+
}
diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
index 015ce51..1aa99cf 100644
--- a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
+++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
@@ -403,6 +403,24 @@
AND (grid.name = #{gridName} or grid.id = #{gridName})
+
+