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

分类标签调整

dev
李鹏飞 6 years ago
parent
43d10b4acb
commit
3aafe5a1d0
7 changed files with 145 additions and 99 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. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java
  2. 48
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
  3. 37
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
  4. 67
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java
  5. 14
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
  6. 67
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
  7. 7
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java
View File

@ -71,13 +71,13 @@ public class IssueServiceImpl implements IssueService {
// formDto.setCommunityId(deptDTO.getCommunityId());
// 父所有部门（包含街道、社区）
String deptNames = (StringUtils.isNotEmpty(deptDTO.getStreet()) ? deptDTO.getStreet() : "");
deptNames += (StringUtils.isNotEmpty(deptDTO.getCommunity()) ? ","+deptDTO.getCommunity() : "");
deptNames += (StringUtils.isNotEmpty(deptDTO.getCommunity()) ? "-"+deptDTO.getCommunity() : "");
String deptIds = (deptDTO.getStreetId()!=null && deptDTO.getStreetId()!= 0 ? deptDTO.getStreetId().toString() : "");
deptIds += (deptDTO.getCommunityId()!=null && deptDTO.getCommunityId()!= 0 ? ","+deptDTO.getCommunityId().toString() : "");
formDto.setParentDeptIds(deptIds);
formDto.setParentDeptNames(deptNames);
// 所有部门（包含街道、社区、网格）
deptNames += (StringUtils.isNotEmpty(deptDTO.getGrid()) ? ","+deptDTO.getGrid() : "");
deptNames += (StringUtils.isNotEmpty(deptDTO.getGrid()) ? "-"+deptDTO.getGrid() : "");
deptIds += (deptDTO.getGridId()!=null && deptDTO.getGridId()!= 0 ? ","+deptDTO.getGridId().toString() : "");
formDto.setAllDeptIds(deptIds);
formDto.setAllDeptNames(deptNames);

48
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
View File

@ -68,30 +68,30 @@ public class EpdcEventsEntity extends BaseEpdcEntity {
*/
private String eventContent;
/**
* 区
*/
private String area;
/**
* 区ID
*/
private Long areaId;
/**
* 街道
*/
private String street;
/**
* 街道ID
*/
private Long streetId;
/**
* 社区
*/
private String community;
/**
* 社区ID
*/
private Long communityId;
// /**
// * 区
// */
// private String area;
// /**
// * 区ID
// */
// private Long areaId;
// /**
// * 街道
// */
// private String street;
// /**
// * 街道ID
// */
// private Long streetId;
// /**
// * 社区
// */
// private String community;
// /**
// * 社区ID
// */
// private Long communityId;
/**
* 父所有部门ID

37
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
View File

@ -34,6 +34,7 @@ import com.elink.esua.epdc.constant.ImageConstant;
import com.elink.esua.epdc.constants.MenuCodeConstant;
import com.elink.esua.epdc.dto.MenuNoticeDTO;
import com.elink.esua.epdc.dto.SysDeptDTO;
import com.elink.esua.epdc.dto.category.CategoryDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
import com.elink.esua.epdc.dto.events.*;
import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
@ -44,6 +45,8 @@ import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
import com.elink.esua.epdc.modules.async.DeptRespondTask;
import com.elink.esua.epdc.modules.async.NewsTask;
import com.elink.esua.epdc.modules.category.entity.CategoryEntity;
import com.elink.esua.epdc.modules.category.service.CategoryService;
import com.elink.esua.epdc.modules.events.dao.EpdcEventsDao;
import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
@ -98,6 +101,9 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
@Autowired
private GroupFeignClient groupFeignClient;
@Autowired
private CategoryService categoryService;
@Override
public PageData<EpdcEventsDTO> listOfPendingReviewEvents(Map<String, Object> params) {
IPage<EpdcEventsDTO> page = getPage(params);
@ -334,12 +340,12 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
issueEntity.setMobile(entity.getMobile());
issueEntity.setIssueContent(entity.getEventContent());
issueEntity.setDistributeTime(entity.getCreatedTime());
issueEntity.setArea(entity.getArea());
issueEntity.setAreaId(entity.getAreaId());
issueEntity.setStreet(entity.getStreet());
issueEntity.setStreetId(entity.getStreetId());
issueEntity.setCommunity(entity.getCommunity());
issueEntity.setCommunityId(entity.getCommunityId());
// issueEntity.setArea(entity.getArea());
// issueEntity.setAreaId(entity.getAreaId());
// issueEntity.setStreet(entity.getStreet());
// issueEntity.setStreetId(entity.getStreetId());
// issueEntity.setCommunity(entity.getCommunity());
// issueEntity.setCommunityId(entity.getCommunityId());
issueEntity.setParentDeptIds(entity.getParentDeptIds());
issueEntity.setParentDeptNames(entity.getParentDeptNames());
issueEntity.setAllDeptIds(entity.getAllDeptIds());
@ -348,6 +354,25 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
issueEntity.setGridId(entity.getGridId());
issueEntity.setIssueAddress(entity.getIssueAddress());
issueEntity.setCategoryCode(entity.getCategoryCode());
//初始化分类
List<CategoryEntity> cateList = categoryService.getPidListById(Long.parseLong(entity.getCategoryCode()));
if(cateList != null && cateList.size() > 0) {
issueEntity.setFirstcategoryCode(cateList.get(0).getCategoryCode());
String name = "";
for (int i = 0; i < cateList.size(); i++){
if (i == cateList.size() -1){
name = name + cateList.get(i).getCategoryName();
}else {
name = name + cateList.get(i).getCategoryName() + "-";
}
}
issueEntity.setCategoryFullName(name);
} else {
issueEntity.setFirstcategoryCode(entity.getCategoryCode());
CategoryDTO dto =categoryService.get(Long.parseLong(entity.getCategoryCode()));
issueEntity.setCategoryFullName(dto.getCategoryName());
}
issueEntity.setIssueLatitude(entity.getIssueLatitude());
issueEntity.setIssueLongitude(entity.getIssueLongitude());
issueEntity.setGroupId(entity.getGroupId());

67
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java
View File

@ -79,35 +79,35 @@ public class IssueEntity extends BaseEpdcEntity {
*/
private Date distributeTime;
/**
* 区
*/
private String area;
/**
* 区ID
*/
private Long areaId;
/**
* 街道
*/
private String street;
/**
* 街道ID
*/
private Long streetId;
/**
* 社区
*/
private String community;
/**
* 社区ID
*/
private Long communityId;
// /**
// * 区
// */
// private String area;
//
// /**
// * 区ID
// */
// private Long areaId;
//
// /**
// * 街道
// */
// private String street;
//
// /**
// * 街道ID
// */
// private Long streetId;
//
// /**
// * 社区
// */
// private String community;
//
// /**
// * 社区ID
// */
// private Long communityId;
/**
* 父所有部门ID
*/
@ -174,5 +174,14 @@ public class IssueEntity extends BaseEpdcEntity {
* 话题ID
*/
private String topicId;
/**
* 一级分类ID
*/
private String firstcategoryCode;
/**
* 分类全称
*/
private String categoryFullName;
}

14
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
View File

@ -384,19 +384,21 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
itemEntity.setMobile(issueEntity.getMobile());
itemEntity.setItemContent(issueEntity.getIssueContent());
itemEntity.setDistributeTime(issueEntity.getDistributeTime());
itemEntity.setArea(issueEntity.getArea());
itemEntity.setAreaId(issueEntity.getAreaId());
itemEntity.setStreet(issueEntity.getStreet());
itemEntity.setStreetId(issueEntity.getStreetId());
// itemEntity.setArea(issueEntity.getArea());
// itemEntity.setAreaId(issueEntity.getAreaId());
// itemEntity.setStreet(issueEntity.getStreet());
// itemEntity.setStreetId(issueEntity.getStreetId());
itemEntity.setParentDeptIds(issueEntity.getParentDeptIds());
itemEntity.setParentDeptNames(issueEntity.getParentDeptNames());
itemEntity.setAllDeptIds(issueEntity.getAllDeptIds());
itemEntity.setAllDeptNames(issueEntity.getAllDeptNames());
itemEntity.setGrid(issueEntity.getGrid());
itemEntity.setGridId(issueEntity.getGridId());
itemEntity.setCommunity(issueEntity.getCommunity());
itemEntity.setCommunityId(issueEntity.getCommunityId());
// itemEntity.setCommunity(issueEntity.getCommunity());
// itemEntity.setCommunityId(issueEntity.getCommunityId());
itemEntity.setCategoryCode(issueEntity.getCategoryCode());
itemEntity.setFirstcategoryCode(issueEntity.getFirstcategoryCode());
itemEntity.setCategoryFullName(issueEntity.getCategoryFullName());
itemEntity.setIssueAddress(issueEntity.getIssueAddress());
itemEntity.setIssueLongitude(issueEntity.getIssueLongitude());
itemEntity.setIssueLatitude(issueEntity.getIssueLatitude());

67
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
View File

@ -79,35 +79,35 @@ public class ItemEntity extends BaseEpdcEntity {
*/
private Date distributeTime;
/**
* 区
*/
private String area;
/**
* 区ID
*/
private Long areaId;
/**
* 街道
*/
private String street;
/**
* 街道ID
*/
private Long streetId;
/**
* 社区
*/
private String community;
/**
* 社区ID
*/
private Long communityId;
// /**
// * 区
// */
// private String area;
//
// /**
// * 区ID
// */
// private Long areaId;
//
// /**
// * 街道
// */
// private String street;
//
// /**
// * 街道ID
// */
// private Long streetId;
//
// /**
// * 社区
// */
// private String community;
//
// /**
// * 社区ID
// */
// private Long communityId;
/**
* 父所有部门ID
*/
@ -197,5 +197,14 @@ public class ItemEntity extends BaseEpdcEntity {
* 话题ID
*/
private String topicId;
/**
* 一级分类ID
*/
private String firstcategoryCode;
/**
* 分类全称
*/
private String categoryFullName;
}

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

@ -614,15 +614,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
// 通知部门Id（网格）
itemInfoDto.setDeptId(entity.getGridId().toString());
itemInformationService.insert(itemInfoDto);
// 社区党工委和街道党工委处理
// 街道部门和区直部门
} else if (OrganizationTypeConstant.ORG_TYPE_STREET_DEPT.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
// 街道部门和区直部门
//插入项目消息表（网格和街道）
// 通知部门Id（网格）
itemInfoDto.setDeptId(entity.getGridId().toString());
itemInformationService.insert(itemInfoDto);
//修改通知部门Id（街道Id）
itemInfoDto.setDeptId(entity.getStreetId().toString());
Result<CompleteDeptDTO> result =adminFeignClient.getCompleteDept(entity.getGridId());
CompleteDeptDTO comDeptDto = result.getData();
itemInfoDto.setDeptId(comDeptDto.getStreetId().toString());
itemInformationService.insert(itemInfoDto);
}
// 吹哨处理

Write Preview
Loading…
Cancel
Save