diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java b/laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java index c2592621..de6b7b8c 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java @@ -328,6 +328,7 @@ public class CommonConstant { public static final String STANDARD_SOURCE_1 = "1"; public static final String STANDARD_SOURCE_2 = "2"; public static final String STANDARD_SOURCE_3 = "3"; + public static final String STANDARD_SOURCE_4 = "4"; /** * 阅读状态(1未读、2已读) diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java index e4468675..799c58e1 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java @@ -198,6 +198,37 @@ public class LawsStandardSharingController extends JeroController dynamicMessages(@RequestBody LawsStandardSharing lawsStandardSharing) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + SysUser user = sysUserService.getById(sysUser.getId()); + String recipientId = lawsStandardSharing.getRecipientId(); + Date date = new Date(); + List sharings = new ArrayList<>(); + List recipientIdList = Arrays.asList(recipientId.split(",")); + for (int i = 0; i < recipientIdList.size(); i++) { + LawsStandardSharing sharing = new LawsStandardSharing(); + sharing.setSource(CommonConstant.STANDARD_SOURCE_4); + sharing.setSharerId(sysUser.getId()); + sharing.setSharerName(user.getNameWorkNo()); + sharing.setRecipientId(recipientIdList.get(i)); + SysUser userServiceById = sysUserService.getById(recipientIdList.get(i)); + sharing.setRecipientName(userServiceById.getNameWorkNo()); + sharing.setSharingTime(date); + sharing.setShareDescription(lawsStandardSharing.getShareDescription()); + sharing.setReadingStatus("1"); + sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); + sharings.add(sharing); + } + lawsStandardSharingService.saveBatch(sharings); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } + /** * 批量删除 */ diff --git a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java index 2a4b58c3..6411f539 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java @@ -38,14 +38,13 @@ public class LawsStandardSharing implements Serializable { @ApiModelProperty(value = "主键") private String id; - /**分享标准来源、所属板块(1国内标准法规、2海外标准法规、3企业标准法规)*/ + /**分享标准来源、所属板块(1国内标准法规、2海外标准法规、3企业标准法规、4动态消息)*/ @Dict(dicCode = "sector") - @ApiModelProperty(value = "所属板块(1国内标准法规、2海外标准法规、3企业标准法规)") + @ApiModelProperty(value = "所属板块(1国内标准法规、2海外标准法规、3企业标准法规、4动态消息)") private String source; /**标准ID*/ @ApiModelProperty(value = "标准ID") - @NotBlank(message = "standardId not null") private String standardId; /**标准编号*/ @@ -119,7 +118,6 @@ public class LawsStandardSharing implements Serializable { @ApiModelProperty(value = "删除状态(0-正常,1-删除)") private String delFlag; - @TableField(exist = false) - @ApiModelProperty(value = "标题(编号+名称)") + @ApiModelProperty(value = "标题/动态标题(编号+名称)") private String title; } diff --git a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java index b566b178..0dd62e89 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java @@ -58,6 +58,9 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl records) { for (LawsStandardSharing record : records) { + if (CommonConstant.STANDARD_SOURCE_4.equals(record.getSource())){ + continue; + } String standardNum = record.getStandardNumber(); String standardName = record.getStandardName(); record.setTitle(standardName + "(" + standardNum + ")");