|
|
|
@ -34,6 +34,7 @@ import com.elink.esua.epdc.dao.NewsDao; |
|
|
|
import com.elink.esua.epdc.dto.BannerDTO; |
|
|
|
import com.elink.esua.epdc.dto.NewsDTO; |
|
|
|
import com.elink.esua.epdc.dto.NewsUserAttitudeDTO; |
|
|
|
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsDetailFormDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO; |
|
|
|
import com.elink.esua.epdc.entity.NewsUserAttitudeEntity; |
|
|
|
@ -95,23 +96,26 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem |
|
|
|
private QueryWrapper<NewsEntity> getWrapper(Map<String, Object> params) { |
|
|
|
UserDetail user = SecurityUser.getUser(); |
|
|
|
String draft = (String) params.get("draft"); |
|
|
|
String streetId = (String) params.get(FieldConstant.STREET_ID_HUMP); |
|
|
|
String communityId = (String) params.get(FieldConstant.COMMUNITY_ID_HUMP); |
|
|
|
/*String streetId = (String) params.get(FieldConstant.STREET_ID_HUMP); |
|
|
|
String communityId = (String) params.get(FieldConstant.COMMUNITY_ID_HUMP);*/ |
|
|
|
String gridId = (String) params.get(FieldConstant.GRID_ID_HUMP); |
|
|
|
String startTime = (String) params.get("startTime"); |
|
|
|
String endTime = (String) params.get("endTime"); |
|
|
|
String category = (String) params.get("category"); |
|
|
|
String keyword = ((String) params.get("keyword")); |
|
|
|
QueryWrapper<NewsEntity> wrapper = new QueryWrapper<>(); |
|
|
|
wrapper.eq(StringUtils.isNotBlank(streetId), FieldConstant.STREET_ID, streetId); |
|
|
|
/*wrapper.eq(StringUtils.isNotBlank(streetId), FieldConstant.STREET_ID, streetId); |
|
|
|
wrapper.eq(StringUtils.isNotBlank(communityId), "COMMUNITY_ID", communityId); |
|
|
|
wrapper.eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId); |
|
|
|
wrapper.eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId);*/ |
|
|
|
wrapper.ge(StringUtils.isNotBlank(startTime), FieldConstant.CREATED_TIME, startTime); |
|
|
|
wrapper.lt(StringUtils.isNotBlank(endTime), FieldConstant.CREATED_TIME, endTime); |
|
|
|
wrapper.eq(StringUtils.isNotBlank(category), "NEWS_CATERORY_ID", category); |
|
|
|
if (StringUtils.isNotBlank(keyword)) { |
|
|
|
wrapper.like("NEWS_TITLE", keyword.trim()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(gridId)) { |
|
|
|
wrapper.like("ALL_DEPT_IDS", gridId.trim()); |
|
|
|
} |
|
|
|
wrapper.eq(FieldConstant.CREATED_BY, user.getId()); |
|
|
|
//draft 前端传上来的一个标志 有则代表是存草稿箱的 1
|
|
|
|
if (StringUtils.isNotEmpty(draft)) { |
|
|
|
@ -222,31 +226,35 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem |
|
|
|
} else { |
|
|
|
isSave = false; |
|
|
|
} |
|
|
|
Long streetId = entity.getStreetId(); |
|
|
|
// 区党委，新增新闻时选择全部街道
|
|
|
|
if (NumConstant.ONE_L == streetId && "district_party".equals(user.getTypeKey())) { |
|
|
|
streetId = user.getDeptId(); |
|
|
|
entity.setStreet(user.getDeptName()); |
|
|
|
} |
|
|
|
List<String> allDeptIds = newsDto.getAllDeptIds(); |
|
|
|
// 新闻所属部门id
|
|
|
|
Long newsDeptId = streetId; |
|
|
|
// 能接收通知的所有网格的ID
|
|
|
|
List<Long> newsGridList = Lists.newArrayList(); |
|
|
|
if (null != entity.getCommunityId()) { |
|
|
|
newsDeptId = entity.getCommunityId(); |
|
|
|
} |
|
|
|
if (null != entity.getGridId()) { |
|
|
|
newsDeptId = entity.getGridId(); |
|
|
|
newsGridList.add(newsDeptId); |
|
|
|
Long newsDeptId = 0L; |
|
|
|
if(allDeptIds != null && allDeptIds.size() != 0){ |
|
|
|
// 塞入全部部门ids,names
|
|
|
|
newsDeptId = Long.valueOf(allDeptIds.get(allDeptIds.size() - 1)); |
|
|
|
Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(newsDeptId)); |
|
|
|
if (!parentResult.success() || parentResult.getData() == null) { |
|
|
|
throw new RenException("获取部门信息失败"); |
|
|
|
}else { |
|
|
|
ParentAndAllDeptDTO deptDTO = parentResult.getData(); |
|
|
|
entity.setAllDeptIds(deptDTO.getAllDeptIds()); |
|
|
|
entity.setAllDeptNames(deptDTO.getAllDeptNames()); |
|
|
|
entity.setParentDeptIds(deptDTO.getParentDeptIds()); |
|
|
|
entity.setParentDeptNames(deptDTO.getParentDeptNames()); |
|
|
|
} |
|
|
|
}else { |
|
|
|
throw new RenException("所属部门不能为空"); |
|
|
|
} |
|
|
|
// 新闻发布方不是区党委，也没有该部门数据权限
|
|
|
|
if (!"district_party".equals(user.getTypeKey()) && !user.getDeptIdList().contains(newsDeptId)) { |
|
|
|
throw new RenException("您没有操作此部门的数据权限"); |
|
|
|
} |
|
|
|
// 能接收通知的所有网格的ID
|
|
|
|
List<Long> newsGridList = Lists.newArrayList(); |
|
|
|
//草稿箱操作
|
|
|
|
if (YesOrNoEnum.YES.value().equals(newsReleaseState)) { |
|
|
|
if (isSave) { |
|
|
|
setNull(newsDto, entity); |
|
|
|
// setNull(newsDto, entity);
|
|
|
|
insert(entity); |
|
|
|
} else { |
|
|
|
entity.setUpdatedBy(user.getRealName()); |
|
|
|
@ -262,7 +270,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem |
|
|
|
newsGridList = adminResult.getData(); |
|
|
|
} |
|
|
|
if (isSave) { |
|
|
|
setNull(newsDto, entity); |
|
|
|
// setNull(newsDto, entity);
|
|
|
|
insert(entity); |
|
|
|
} else { |
|
|
|
entity.setUpdatedBy(user.getRealName()); |
|
|
|
@ -278,14 +286,14 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem |
|
|
|
} |
|
|
|
|
|
|
|
private void setNull(NewsDTO newsDto, NewsEntity entity) { |
|
|
|
if (newsDto.getCommunityId() == null || StringUtils.isBlank(newsDto.getCommunity()) || newsDto.getCommunityId() == 0) { |
|
|
|
/*if (newsDto.getCommunityId() == null || StringUtils.isBlank(newsDto.getCommunity()) || newsDto.getCommunityId() == 0) { |
|
|
|
entity.setCommunity(null); |
|
|
|
entity.setCommunityId(null); |
|
|
|
} |
|
|
|
if (newsDto.getGridId() == null || newsDto.getGridId() == 0 || StringUtils.isBlank(newsDto.getGrid())) { |
|
|
|
entity.setGridId(null); |
|
|
|
entity.setGrid(null); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|
gupeng
6 years ago