From 7e9d88b2c45818c4e3568879029f2e6b64656e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E4=BD=B3?= Date: Thu, 9 Sep 2021 23:49:54 +0800 Subject: [PATCH] =?UTF-8?q?writer=E6=8E=A5=E5=8F=A3url=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8CVo=E5=8F=82=E6=95=B0=E5=8E=BB=E6=8E=89platform?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/NotificationSystemConstant.java | 11 ++++++ .../dao/entity/vo/NewSysNotificationVo.java | 12 ------- .../entity/vo/UpdateNotificationStatusVo.java | 12 ------- .../impl/SysNotificationServiceImpl.java | 3 +- .../notification/CachedServiceTest.java | 1 - .../controller/NotificationController.java | 7 ++-- .../controller/NotificationController.java | 34 ++++++++++++------- 7 files changed, 37 insertions(+), 43 deletions(-) create mode 100644 common/src/main/java/cn/org/gitlink/notification/common/constant/NotificationSystemConstant.java diff --git a/common/src/main/java/cn/org/gitlink/notification/common/constant/NotificationSystemConstant.java b/common/src/main/java/cn/org/gitlink/notification/common/constant/NotificationSystemConstant.java new file mode 100644 index 0000000..ed2a44e --- /dev/null +++ b/common/src/main/java/cn/org/gitlink/notification/common/constant/NotificationSystemConstant.java @@ -0,0 +1,11 @@ +package cn.org.gitlink.notification.common.constant; + +/** + * @description: + * @author: wanjia + * @time: 2021/9/9 + */ +public class NotificationSystemConstant { + //平台编码 + public static final String PLATFORM_CODE_GITLINK = "gitlink"; //gitlink平台 +} diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java index ad2f6a4..52cc2a6 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java @@ -10,10 +10,6 @@ import javax.validation.constraints.Size; public class NewSysNotificationVo { - @ApiModelProperty(value = "平台编码", required = true) - @NotBlank(message = "平台编码不能为空") - private String platform; - @ApiModelProperty(value = "消息发送者", required = true) @NotNull(message = "消息发送者不能为空") @Range(min = Integer.MIN_VALUE, max = Integer.MAX_VALUE) @@ -59,14 +55,6 @@ public class NewSysNotificationVo { this.extra = extra; } - public String getPlatform() { - return platform; - } - - public void setPlatform(String platform) { - this.platform = platform; - } - public Integer getSender() { return sender; } diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/UpdateNotificationStatusVo.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/UpdateNotificationStatusVo.java index 49946c0..5f36e82 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/UpdateNotificationStatusVo.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/UpdateNotificationStatusVo.java @@ -8,10 +8,6 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; public class UpdateNotificationStatusVo { - @ApiModelProperty(value = "平台编号", required = true) - @NotBlank - private String platform; - @ApiModelProperty(value = "消息ids", required = true) @NotBlank @Pattern(regexp = "^\\d+(,\\d+)*$", message = "消息id串非法") @@ -32,14 +28,6 @@ public class UpdateNotificationStatusVo { this.receiver = receiver; } - public String getPlatform() { - return platform; - } - - public void setPlatform(String platform) { - this.platform = platform; - } - public String getNotificationIds() { return notificationIds; } diff --git a/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java b/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java index 8d5232d..5219898 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java @@ -1,5 +1,6 @@ package cn.org.gitlink.notification.model.service.notification.impl; +import cn.org.gitlink.notification.common.constant.NotificationSystemConstant; import cn.org.gitlink.notification.common.utils.RedisUtil; import cn.org.gitlink.notification.model.dao.entity.SysNotification; import cn.org.gitlink.notification.model.dao.entity.vo.NewSysNotificationVo; @@ -36,7 +37,7 @@ public class SysNotificationServiceImpl extends ServiceImpl list = Arrays.asList(newSysNotificationVo.getReceivers().split(",")); for (String receiver : list) { sysNotification.setReceiver(Integer.parseInt(receiver)); - baseMapper.insertSelective(newSysNotificationVo.getPlatform(), sysNotification); + baseMapper.insertSelective(NotificationSystemConstant.PLATFORM_CODE_GITLINK, sysNotification); this.delUserCache(Integer.parseInt(receiver)); } return true; diff --git a/model/src/test/java/cn/org/gitlink/notification/model/service/notification/CachedServiceTest.java b/model/src/test/java/cn/org/gitlink/notification/model/service/notification/CachedServiceTest.java index 7f8fbca..e97515a 100644 --- a/model/src/test/java/cn/org/gitlink/notification/model/service/notification/CachedServiceTest.java +++ b/model/src/test/java/cn/org/gitlink/notification/model/service/notification/CachedServiceTest.java @@ -20,7 +20,6 @@ public class CachedServiceTest { notificationVo.setContent("wowowowowo"); notificationVo.setReceivers("1111,2222,3333,4444,5555"); notificationVo.setExtra("extra_info"); - notificationVo.setPlatform("gitlink"); notificationVo.setSource("delete_issue"); notificationVo.setType(1); try { diff --git a/reader/src/main/java/cn/org/gitlink/notification/reader/controller/NotificationController.java b/reader/src/main/java/cn/org/gitlink/notification/reader/controller/NotificationController.java index 4cb42d2..e56839b 100644 --- a/reader/src/main/java/cn/org/gitlink/notification/reader/controller/NotificationController.java +++ b/reader/src/main/java/cn/org/gitlink/notification/reader/controller/NotificationController.java @@ -1,5 +1,6 @@ package cn.org.gitlink.notification.reader.controller; +import cn.org.gitlink.notification.common.constant.NotificationSystemConstant; import cn.org.gitlink.notification.common.response.DataPacketUtil; import cn.org.gitlink.notification.common.response.ResponseData; import cn.org.gitlink.notification.common.utils.RedisUtil; @@ -18,10 +19,6 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping(value = "/gns/notification") public class NotificationController { - - //平台编号 - private static final String PLATFORM_CODE_GITLINK = "gitlink"; - //未读消息类型 private static final Integer NOTIFICATION_TYPE_ALL = -1; //全部未读消息 private static final Integer NOTIFICATION_TYPE_SYS = 1; //系统消息 @@ -184,7 +181,7 @@ public class NotificationController { private ResponseData validatePlatformCodeAndReceiver(String platform, Integer receiver) { //验证 {platform} 参数合法性，以判断请求来源 - if (!platform.trim().toLowerCase().equals(PLATFORM_CODE_GITLINK)) { + if (!platform.trim().toLowerCase().equals(NotificationSystemConstant.PLATFORM_CODE_GITLINK)) { logger.debug("\t 输入参数 {platform} 的值 {" + platform + "} 无效"); return DataPacketUtil.jsonFailResult("{platform} 参数非法"); } diff --git a/writer/src/main/java/cn/org/gitlink/notification/writer/controller/NotificationController.java b/writer/src/main/java/cn/org/gitlink/notification/writer/controller/NotificationController.java index 8740443..448443c 100644 --- a/writer/src/main/java/cn/org/gitlink/notification/writer/controller/NotificationController.java +++ b/writer/src/main/java/cn/org/gitlink/notification/writer/controller/NotificationController.java @@ -1,5 +1,6 @@ package cn.org.gitlink.notification.writer.controller; +import cn.org.gitlink.notification.common.constant.NotificationSystemConstant; import cn.org.gitlink.notification.common.response.DataPacketUtil; import cn.org.gitlink.notification.common.response.ResponseData; import cn.org.gitlink.notification.common.utils.KafkaUtil; @@ -9,6 +10,7 @@ import cn.org.gitlink.notification.model.service.notification.SysNotificationSer import cn.org.gitlink.notification.model.dao.entity.vo.UpdateNotificationStatusVo; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -21,10 +23,6 @@ import java.util.Map; @RestController @RequestMapping(value = "/gns/notification") public class NotificationController { - - //平台编号 - private static final String PLATFORM_CODE_GITLINK = "gitlink"; - @Autowired private KafkaUtil kafkaUtil; @@ -34,15 +32,21 @@ public class NotificationController { private Logger logger = LogManager.getLogger(NotificationController.class); @ApiOperation("添加系统消息") - @RequestMapping(path = "/", method = RequestMethod.POST) + @RequestMapping(path = "/{platform}", method = RequestMethod.POST) @ResponseBody - public ResponseData sendNotification(@Validated @RequestBody NewSysNotificationVo newSysNotificationVo, BindingResult bindingResult) { + public ResponseData sendNotification(@ApiParam(value = "平台编码", required = true) + @PathVariable(name = "platform") String platform, + + @Validated @RequestBody NewSysNotificationVo newSysNotificationVo, + + BindingResult bindingResult) { + //参数合法性验证 Map errors = ValidatorUtils.buildValidationErrorMessageMap(bindingResult); if (!errors.isEmpty()) { return DataPacketUtil.jsonFailResult(errors); } - ResponseData jsonFailResult = validatePlatformCode(newSysNotificationVo.getPlatform()); + ResponseData jsonFailResult = validatePlatformCode(platform); if (jsonFailResult != null) return jsonFailResult; try { @@ -56,19 +60,25 @@ public class NotificationController { } @ApiOperation("改变系统消息状态") - @RequestMapping(path = "/", method = RequestMethod.PUT) + @RequestMapping(path = "/{platform}", method = RequestMethod.PUT) @ResponseBody - public ResponseData changeNotificationStatus(@Validated @RequestBody UpdateNotificationStatusVo updateNotificationStatusVo, BindingResult bindingResult) { + public ResponseData changeNotificationStatus(@ApiParam(value = "平台编码", required = true) + @PathVariable(name = "platform") String platform, + + @Validated @RequestBody UpdateNotificationStatusVo updateNotificationStatusVo, + + BindingResult bindingResult) { + //参数合法性验证 Map errors = ValidatorUtils.buildValidationErrorMessageMap(bindingResult); if (!errors.isEmpty()) { return DataPacketUtil.jsonFailResult(errors); } - ResponseData jsonFailResult = validatePlatformCode(updateNotificationStatusVo.getPlatform()); + ResponseData jsonFailResult = validatePlatformCode(platform); if (jsonFailResult != null) return jsonFailResult; try { - sysNotificationService.markNotificationAs(updateNotificationStatusVo.getPlatform(), updateNotificationStatusVo.getReceiver(), updateNotificationStatusVo.getNotificationIds(), updateNotificationStatusVo.getStatus()); + sysNotificationService.markNotificationAs(platform, updateNotificationStatusVo.getReceiver(), updateNotificationStatusVo.getNotificationIds(), updateNotificationStatusVo.getStatus()); return DataPacketUtil.jsonSuccessResult(); } catch (Exception e) { logger.error(e); @@ -86,7 +96,7 @@ public class NotificationController { private ResponseData validatePlatformCode(String platform) { //验证 {platform} 参数合法性，以判断请求来源 - if (!platform.trim().toLowerCase().equals(PLATFORM_CODE_GITLINK)) { + if (!platform.trim().toLowerCase().equals(NotificationSystemConstant.PLATFORM_CODE_GITLINK)) { logger.debug("\t 输入参数 {platform} 的值 {" + platform + "} 无效"); return DataPacketUtil.jsonFailResult("{platform} 参数非法"); }