Browse Source

内容管理获取部门信息修改

feature/syp_points
songyunpeng 5 years ago
parent
commit
56bb8683eb
  1. 1
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java
  2. 1
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java
  3. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java
  4. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
  5. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
  6. 8
      esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java
  7. 10
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java
  8. 62
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
  9. 13
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
  10. 4
      esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/form/PartyTopicCommentFormDTO.java
  11. 3
      esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicCommentServiceImpl.java
  12. 3
      esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java

1
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java

@ -37,6 +37,7 @@ public class CommentServiceImpl implements CommentService {
commentFormDTO.setUserId(userDetail.getUserId());
commentFormDTO.setUserName(userDetail.getNickname());
commentFormDTO.setUserFace(userDetail.getFaceImg());
commentFormDTO.setDeptId(userDetail.getGridId());
return commentFeignClient.submit(commentFormDTO);
}

1
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java

@ -51,6 +51,7 @@ public class PartyGroupServiceImpl implements PartyGroupService {
formDto.setPartyMember(userDetail.getPartyFlag());
formDto.setUserFace(userDetail.getFaceImg());
formDto.setUserName(userDetail.getNickname());
formDto.setDeptId(userDetail.getGridId());
return partyGroupFeignClient.submit(formDto);
}

5
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java

@ -52,5 +52,8 @@ public class CommentFormDTO {
*是否提交为内容待审核状态
*/
private Boolean isConReview;
/**
* 切换网格ID
*/
private Long deptId;
}

3
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java

@ -29,7 +29,6 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllD
import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.constant.EventsNoticeConstant;
@ -173,7 +172,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
mobile = user.getData().getMobile();
}
// 获取所有上级机构名称和ID拼接
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(commentFormDTO.getDeptId()).getData();
CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
if (!isConReview && (contentResult != null && !contentResult.getAllPass())) {
//组装要保存的信息

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

@ -163,7 +163,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
List<String> textList = new ArrayList<>();
textList.add(dto.getEventContent());
// 获取所有上级机构名称和ID拼接
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(dto.getGridId()).getData();
CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
CheckResultDTO imgResult = CheckDataUtils.checkImgs(dto.getImages());
if(!isConReview &&

8
esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java

@ -81,5 +81,13 @@ public class AppActUserClockLogDTO implements Serializable {
*是否提交为内容待审核状态
*/
private Boolean isConReview;
/**
* 用户名
*/
private String userName;
/**
* 切换网格ID
*/
private Long deptId;
}

10
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java

@ -148,6 +148,16 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
*/
void update(ActInfoDTO dto);
/**
* 带内容审核更新默认更新
*
* @param dto
* @return void
* @author generator
* @date 2019-12-11
*/
Result updateWithContent(ActInfoDTO dto);
/**
*
* 取消活动

62
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java

@ -215,6 +215,68 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result updateWithContent(ActInfoDTO dto) {
//内容审核 - start
Boolean isConReview = dto.getIsConReview();
String userName = null;
String userId = null;
if(null != SecurityUser.getUser()){
userName = SecurityUser.getUser().getUsername();
userId = SecurityUser.getUser().getId().toString();
}
List<String> textList = new ArrayList<>();
textList.add(dto.getTitle());
textList.add(dto.getActContent());
List<String> imgList = new ArrayList<>();
imgList.add(dto.getHeadPic());
imgList.add(dto.getBannerUrl());
// 获取所有上级机构名称和ID拼接
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
CheckResultDTO imgResult = CheckDataUtils.checkImgs(imgList);
if(!isConReview &&
((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass()))){
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
userName, CheckDataUtils.cate_one, CheckDataUtils.decision_one, ModuleName.HELP_ACTIVITY.getCode(), textList,
imgList, null,contentResult, imgResult,null,dto.getTel(),"0",deptDto);
contentSecurityFeign.insertViolationsRecord(record);
return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
}
//内容审核 - end
ActInfoEntity entity = ConvertUtils.sourceToTarget(dto, ActInfoEntity.class);
updateById(entity);
//内容审核- 开始
//接口异常,保存至待审核信息
if((contentResult == null || imgResult == null) && !isConReview) {
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
userName, CheckDataUtils.cate_one, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
imgList, entity.getId(),null,null, null,dto.getTel(),"1",deptDto);
contentSecurityFeign.insertRecords(record);
}
//保存待审核记录
if (contentResult != null && imgResult != null) {
CheckResultMessageDTO twoTypes = null;
if(isConReview){
twoTypes = CheckDataUtils.saveTwoTypes(contentResult, imgResult);
}else{
twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
}
if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
userName, CheckDataUtils.cate_one, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
imgList, entity.getId(),null,null, twoTypes,dto.getTel(),"0",deptDto);
contentSecurityFeign.insertRecords(record);
}
}
//内容审核 - 结束
return new Result();
}
/**
* 活动列表-移动app端用
*

13
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java

@ -37,7 +37,6 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllD
import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
@ -312,17 +311,13 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
public Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO) {
//内容审核 - start
Boolean isConReview = appActUserClockLogDTO.getIsConReview();
String userName = null;
if(null != SecurityUser.getUser()){
userName = SecurityUser.getUser().getUsername();
}
String mobile = null;
Result<UserDTO> user = userInfoFeignClient.getUserInfoById(appActUserClockLogDTO.getUserId());
if(null != user.getData()){
mobile = user.getData().getMobile();
}
// 获取所有上级机构名称和ID拼接
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(appActUserClockLogDTO.getDeptId()).getData();
List<String> textList = new ArrayList<>();
textList.add(appActUserClockLogDTO.getClockDesc());
CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
@ -331,7 +326,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass()))){
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
userName, CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.HELP_SIGNIN.getCode(), textList,
appActUserClockLogDTO.getUserName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.HELP_SIGNIN.getCode(), textList,
appActUserClockLogDTO.getImages(), null,contentResult, imgResult,null,mobile,"0",deptDto);
contentSecurityFeign.insertViolationsRecord(record);
return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
@ -378,7 +373,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
//接口异常,保存至待审核信息
if((contentResult == null || imgResult == null) && !isConReview) {
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
appActUserClockLogDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
appActUserClockLogDTO.getImages(), entity.getId(),null,null, null,mobile,"1",deptDto);
contentSecurityFeign.insertRecords(record);
}
@ -393,7 +388,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
appActUserClockLogDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes,mobile,"0",deptDto);
contentSecurityFeign.insertRecords(record);
}

4
esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/form/PartyTopicCommentFormDTO.java

@ -58,5 +58,9 @@ public class PartyTopicCommentFormDTO {
*是否提交为内容待审核状态
*/
private Boolean isConReview;
/**
* 切换网格ID
*/
private Long deptId;
}

3
esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicCommentServiceImpl.java

@ -29,7 +29,6 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllD
import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dao.PartyTopicCommentDao;
@ -156,7 +155,7 @@ public class PartyTopicCommentServiceImpl extends BaseServiceImpl<PartyTopicComm
mobile = user.getData().getMobile();
}
// 获取所有上级机构名称和ID拼接
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(formDto.getDeptId()).getData();
CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
if (!isConReview && (contentResult != null && !contentResult.getAllPass())) {
//组装要保存的信息

3
esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java

@ -30,7 +30,6 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllD
import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dao.PartyTopicDao;
@ -191,7 +190,7 @@ public class PartyTopicServiceImpl extends BaseServiceImpl<PartyTopicDao, PartyT
List<String> textList = new ArrayList<>();
textList.add(formDto.getTopicContent());
// 获取所有上级机构名称和ID拼接
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(formDto.getGridId()).getData();
CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
CheckResultDTO imgResult = CheckDataUtils.checkImgs(formDto.getImages());
if(!isConReview &&

Loading…
Cancel
Save