elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

从mate_sys_dept表获取相关信息

feature/dangjian
zhaoqifeng 3 years ago
parent
832f40334a
commit
f20223a90a
2 changed files with 27 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  2. 12
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

30
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
View File

@ -47,7 +47,6 @@ import com.elink.esua.epdc.constants.MenuCodeConstant;
import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.category.CategoryDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
import com.elink.esua.epdc.dto.epdc.result.SysDeptAreaCodeResultDTO;
import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
import com.elink.esua.epdc.dto.events.EventsCategoryDTO;
import com.elink.esua.epdc.dto.events.form.GroupFormDTO;
@ -96,6 +95,8 @@ import com.elink.esua.epdc.modules.item.service.*;
import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
import com.elink.esua.epdc.modules.screen.dao.MetaSysDeptDao;
import com.elink.esua.epdc.modules.screen.entity.MetaSysDeptEntity;
import com.elink.esua.epdc.user.dto.UserDTO;
import com.google.common.collect.Lists;
import lombok.SneakyThrows;
@ -223,6 +224,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
private ItemAutoProcessRedis itemAutoProcessRedis;
@Resource
private ItemReportInterfaceLogDao itemReportInterfaceLogDao;
@Resource
private MetaSysDeptDao metaSysDeptDao;
// @Autowired
// private ItemProcessModifyProducer itemProcessModifyProducer;
@ -2940,16 +2943,18 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemHandleProcessDto.setGridDelayhour(dto.getDELAYHOUR());
itemHandleProcessDto.setGridDelayresult(ItemGridPlatformDictEnum.getValueByName(dto.getDELAYRESULT()));
if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) {
Result<SysDeptAreaCodeResultDTO> result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode());
SysDeptAreaCodeResultDTO dept = result.getData();
LambdaQueryWrapper<MetaSysDeptEntity> deptWrapper = new LambdaQueryWrapper<>();
deptWrapper.eq(MetaSysDeptEntity::getAreaCode, itemHandleProcessDto.getGridCantoncode());
MetaSysDeptEntity dept = metaSysDeptDao.selectOne(deptWrapper);
if (dept != null) {
itemHandleProcessDto.setDisCenterZoningCode(dept.getDisCenterZoningCode());
}
}
if (StringUtils.isNotBlank(itemHandleProcessDto.getGridNextcantoncode())) {
Result<SysDeptAreaCodeResultDTO> result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridNextcantoncode());
SysDeptAreaCodeResultDTO dept = result.getData();
LambdaQueryWrapper<MetaSysDeptEntity> deptWrapper = new LambdaQueryWrapper<>();
deptWrapper.eq(MetaSysDeptEntity::getAreaCode, itemHandleProcessDto.getGridNextcantoncode());
MetaSysDeptEntity dept = metaSysDeptDao.selectOne(deptWrapper);
if (dept != null) {
itemHandleProcessDto.setNextDisCenterZoningCode(dept.getDisCenterZoningCode());
}
@ -3972,8 +3977,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemHandleProcessDto.setGridCantoncode(formDto.getGridCantoncode());
//根据网格化区域编码获取对应的市中心区域编码
if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) {
Result<SysDeptAreaCodeResultDTO> result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode());
SysDeptAreaCodeResultDTO dept = result.getData();
LambdaQueryWrapper<MetaSysDeptEntity> deptWrapper = new LambdaQueryWrapper<>();
deptWrapper.eq(MetaSysDeptEntity::getAreaCode, itemHandleProcessDto.getGridCantoncode());
MetaSysDeptEntity dept = metaSysDeptDao.selectOne(deptWrapper);
if (dept != null) {
String zoneCode = dept.getDisCenterZoningCode();
itemHandleProcessDto.setDisCenterZoningCode(zoneCode);
@ -4148,8 +4154,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemHandleProcessDto.setGridCantoncode(formDto.getGridCantoncode());
//根据网格化区域编码获取对应的市中心区域编码
if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) {
Result<SysDeptAreaCodeResultDTO> result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode());
SysDeptAreaCodeResultDTO dept = result.getData();
LambdaQueryWrapper<MetaSysDeptEntity> deptWrapper = new LambdaQueryWrapper<>();
deptWrapper.eq(MetaSysDeptEntity::getAreaCode, itemHandleProcessDto.getGridCantoncode());
MetaSysDeptEntity dept = metaSysDeptDao.selectOne(deptWrapper);
if (dept != null) {
String zoneCode = dept.getDisCenterZoningCode();
itemHandleProcessDto.setDisCenterZoningCode(zoneCode);
@ -5089,8 +5096,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemHandleProcessDto.setGridCantoncode(formDto.getGridCantoncode());
//根据网格化区域编码获取对应的市中心区域编码
if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) {
Result<SysDeptAreaCodeResultDTO> result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode());
SysDeptAreaCodeResultDTO dept = result.getData();
LambdaQueryWrapper<MetaSysDeptEntity> deptWrapper = new LambdaQueryWrapper<>();
deptWrapper.eq(MetaSysDeptEntity::getAreaCode, itemHandleProcessDto.getGridCantoncode());
MetaSysDeptEntity dept = metaSysDeptDao.selectOne(deptWrapper);
if (dept != null) {
String zoneCode = dept.getDisCenterZoningCode();
itemHandleProcessDto.setDisCenterZoningCode(zoneCode);

12
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
View File

@ -55,6 +55,8 @@ import com.elink.esua.epdc.modules.item.dao.*;
import com.elink.esua.epdc.modules.item.entity.*;
import com.elink.esua.epdc.modules.item.service.ItemService;
import com.elink.esua.epdc.modules.item.service.PushToCityGridService;
import com.elink.esua.epdc.modules.screen.dao.MetaSysDeptDao;
import com.elink.esua.epdc.modules.screen.entity.MetaSysDeptEntity;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
@ -107,6 +109,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
private ImgDao imgDao;
@Resource
private ItemReportErrorLogDao itemReportErrorLogDao;
@Resource
private MetaSysDeptDao metaSysDeptDao;
@Override
public void appealDispatch(ItemHandleProcessDTO formDTO) {
@ -1321,12 +1325,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
}
CityCenterFromDTO formDTO = new CityCenterFromDTO();
formDTO.setDeptId(deptId);
Result<SysDeptDTO> dept = adminFeignClient.getDept(formDTO);
if (dept.success()) {
MetaSysDeptEntity dept = metaSysDeptDao.selectById(deptId);
if (null != dept) {
if (NumConstant.ZERO_STR.equals(type)) {
return dept.getData() == null ? "" : dept.getData().getDisCenterZoningCode();
return dept.getDisCenterZoningCode();
} else {
return dept.getData() == null ? "" : dept.getData().getName();
return dept.getName();
}
}
return "";

Write Preview
Loading…
Cancel
Save