From 56bb8683eb311012adc350b3feda0ebf4e11267d Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Thu, 6 Aug 2020 13:38:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/CommentServiceImpl.java | 1 + .../service/impl/PartyGroupServiceImpl.java | 1 + .../epdc/dto/comment/form/CommentFormDTO.java | 5 +- .../service/impl/EventCommentServiceImpl.java | 3 +- .../service/impl/EpdcEventsServiceImpl.java | 2 +- .../epdc/activity/AppActUserClockLogDTO.java | 8 +++ .../activity/service/ActInfoService.java | 10 +++ .../service/impl/ActInfoServiceImpl.java | 62 +++++++++++++++++++ .../impl/ActUserClockLogServiceImpl.java | 13 ++-- .../dto/form/PartyTopicCommentFormDTO.java | 4 ++ .../impl/PartyTopicCommentServiceImpl.java | 3 +- .../service/impl/PartyTopicServiceImpl.java | 3 +- 12 files changed, 98 insertions(+), 17 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java index 466c3ab5..e86cf7b8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java +++ b/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); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java index 7bb9ae5f..5a8bbcbc 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java +++ b/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); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java index 31a2d1c4..af737da3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java index 00aaafd6..71ceaa1b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java +++ b/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 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 && diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java index a42d18ea..0b3f1365 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java index 54eae1a2..be936903 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java +++ b/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 { */ void update(ActInfoDTO dto); + /** + * 带内容审核更新默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2019-12-11 + */ + Result updateWithContent(ActInfoDTO dto); + /** * * 取消活动 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index a7352eb2..9561fb2c 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/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 textList = new ArrayList<>(); + textList.add(dto.getTitle()); + textList.add(dto.getActContent()); + List 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端用 * diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java index a4be2254..d28a2c6f 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java +++ b/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 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 textList = new ArrayList<>(); textList.add(appActUserClockLogDTO.getClockDesc()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); @@ -331,7 +326,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl 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 &&