🚀 消息推送模块

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Message.java

@@ -33,6 +33,9 @@ public class Message extends CommonEntity {
     @ApiModelProperty("消息类型")
     private String type;
 
+    @ApiModelProperty("自定义推送类型ID")
+    private String customTypeId;
+
     @ApiModelProperty("消息状态 0-未读 1-已读")
     private String status;
 

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java

@@ -128,10 +128,11 @@ public class MapTaskController {
     @ApiOperation(value = "设置预设点")
     public R setPresetPoint(@RequestBody MapLogisticPoint mapLogisticPoint) {
         String content = JSONObject.toJSONString(mapLogisticPoint);
+        Message message = new Message();
+        message.setRemarks(content);
+        message.setTitle(SecurityUtils.getUser().getUsername() + "与你对接预设点");
         // 保存交接消息
-        iMessageService.save(new Message()
+        iMessageService.save(message);
-                .setName(SecurityUtils.getUser().getUsername() + "与你对接预设点")
-                .setContent(content));
         // todo: 调用友盟推送接口,目前未测试需要安卓上线平台,后面处理
 
         return R.ok();
@@ -140,8 +141,8 @@ public class MapTaskController {
     @PutMapping("/confirmPresetPoint")
     @ApiOperation(value = "确认预设点")
     public R confirmPresetPoint(@RequestBody Message message) {
-        if (!JSONUtil.isJson(message.getContent())) return R.error("当前消息体内不是json数据,请检查后重试!");
+        if (!JSONUtil.isJson(message.getRemarks())) return R.error("当前消息体内不是json数据,请检查后重试!");
-        MapLogisticPoint mapLogisticPoint = JSONObject.parseObject(message.getContent(), MapLogisticPoint.class);
+        MapLogisticPoint mapLogisticPoint = JSONObject.parseObject(message.getRemarks(), MapLogisticPoint.class);
         iMapTaskService.confirmPresetPoint(mapLogisticPoint);
         iMessageService.removeById(message.getId());
         return R.ok();