🚀 消息推送模块

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

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 @Setter
 @Accessors(chain = true)
 @TableName("common_push_application")
-@ApiModel(value = "PushApplication对象", description = "")
+@ApiModel(value = "PushApplication对象")
 public class PushApplication extends CommonEntity {
 
     private static final long serialVersionUID = 1L;

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

@@ -32,13 +32,13 @@ public class PushCustomType extends CommonEntity {
     private String name;
 
     @ApiModelProperty("是否播放声音")
-    private Boolean playSound;
+    private String playSound;
 
     @ApiModelProperty("是否震动")
-    private Boolean playVibrate;
+    private String playVibrate;
 
     @ApiModelProperty("是否闪光")
-    private Boolean playLights;
+    private String playLights;
 
     @ApiModelProperty("自定义播放文件名称")
     private String customPlayFileName;

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

@@ -0,0 +1,48 @@
+package com.cloud.kicc.commonbiz.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.cloud.kicc.common.data.entity.CommonEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-02-26
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("common_push_file")
+@ApiModel(value = "PushFile对象")
+public class PushFile extends CommonEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    @ApiModelProperty("文件获取地址")
+    private String fileUrl;
+
+    @ApiModelProperty("文件名称")
+    private String fileName;
+
+    @ApiModelProperty("容器名称")
+    private String bucketName;
+
+    @ApiModelProperty("原文件名")
+    private String original;
+
+    @ApiModelProperty("文件类型")
+    private String type;
+
+    @ApiModelProperty("文件大小")
+    private Long fileSize;
+
+}

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

@@ -18,9 +18,9 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("common_message")
+@TableName("common_push_message")
 @ApiModel(value = "Message对象")
-public class Message extends CommonEntity {
+public class PushMessage extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -58,13 +58,13 @@ public class Message extends CommonEntity {
     private String sound;
 
     @ApiModelProperty("收到通知是否震动")
-    private Boolean playVibrate;
+    private String playVibrate;
 
     @ApiModelProperty("收到通知是否闪灯")
-    private Boolean playLights;
+    private String playLights;
 
     @ApiModelProperty("收到通知是否发出声音")
-    private Boolean playSound;
+    private String playSound;
 
     @ApiModelProperty("自定义播放文件名称")
     private String customPlayFileName;

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

@@ -19,16 +19,16 @@ import lombok.experimental.Accessors;
 @Setter
 @Accessors(chain = true)
 @TableName("common_push_pass_list")
-@ApiModel(value = "PushPassList对象", description = "")
+@ApiModel(value = "PushPassList对象")
 public class PushPassList extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 
     private String id;
 
-    private String pushManageId;
+    private String fromPushId;
 
-    private String name;
+    private String toPushId;
 
     private String type;
 

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

@@ -1,65 +0,0 @@
-package com.cloud.kicc.commonbiz.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.cloud.kicc.common.data.entity.CommonEntity;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 推送记录
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-17
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-@TableName("common_push_record")
-@ApiModel(value = "PushRecord对象", description = "")
-public class PushRecord extends CommonEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    @ApiModelProperty("标题")
-    private String title;
-
-    @ApiModelProperty("别名用户ID")
-    private String aliasUserId;
-
-    @ApiModelProperty("通知类型级别")
-    private String typeLevel;
-
-    @ApiModelProperty("别名类型")
-    private String aliasType;
-
-    @ApiModelProperty("推送描述")
-    private String description;
-
-    @ApiModelProperty("通知内容")
-    private String content;
-
-    @ApiModelProperty("后续动作内容")
-    private String afterActionContent;
-
-    @ApiModelProperty("应用ID")
-    private String applicationId;
-
-    @ApiModelProperty("是否震动")
-    private String isVibration;
-
-    @ApiModelProperty("是否响铃")
-    private String isSound;
-
-    @ApiModelProperty("自定义铃声")
-    private String customSound;
-
-
-}

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

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 @Setter
 @Accessors(chain = true)
 @TableName("common_push_third_party")
-@ApiModel(value = "PushThirdParty对象", description = "")
+@ApiModel(value = "PushThirdParty对象")
 public class PushThirdParty extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@ public class PushThirdParty extends CommonEntity {
     private String idCard;
 
     @ApiModelProperty("企业名称")
-    private String enterpName;
+    private String entName;
 
     @ApiModelProperty("营业执照文件")
     private String licenseFileId;

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

@@ -1,49 +0,0 @@
-package com.cloud.kicc.commonbiz.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.cloud.kicc.common.data.entity.CommonEntity;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-@TableName("common_push_third_party_manage")
-@ApiModel(value = "PushThirdPartyManage对象", description = "")
-public class PushThirdPartyManage extends CommonEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    @ApiModelProperty("第三方ID")
-    private String thirdPartyId;
-
-    @ApiModelProperty("企业名称")
-    private String enterpName;
-
-    @ApiModelProperty("自定义推送类型ID")
-    private String pushTypeId;
-
-    @ApiModelProperty("是否震动")
-    private String isVibration;
-
-    @ApiModelProperty("是否响铃")
-    private String isSound;
-
-    @ApiModelProperty("自定义铃声")
-    private String customSound;
-
-}

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

@@ -21,27 +21,32 @@ import lombok.experimental.Accessors;
 @Setter
 @Accessors(chain = true)
 @TableName("common_push_user_manage")
-@ApiModel(value = "PushUserManage对象", description = "")
+@ApiModel(value = "PushUserManage对象")
 public class PushUserManage extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 
     private String id;
 
-    private String userId;
+    @ApiModelProperty("对方用户id")
+    private String toUserId;
 
+    @ApiModelProperty("用户昵称")
     private String nickName;
 
-    private String sex;
+    @ApiModelProperty("状态")
+    private String Status;
 
-    private String avatar;
+    @ApiModelProperty("是否播放声音")
+    private String playSound;
 
-    private String pushTypeId;
+    @ApiModelProperty("是否震动")
+    private String playVibrate;
 
-    private String isVibration;
+    @ApiModelProperty("是否闪光")
+    private String playLights;
 
-    private String isSound;
+    @ApiModelProperty("推送列表类型")
-
+    private String type;
-    private String customSound;
 
 }

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

@@ -1,36 +0,0 @@
-package com.cloud.kicc.commonbiz.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- *<p>
- * 用户和消息推送关联表
- *</p>
- *
- * @Author: entfrm开发团队-王翔
- * @Date: 2022/2/24
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("sys_user_push")
-public class UserPush implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户ID
-     */
-    private String userId;
-
-    /**
-     * 推送ID
-     */
-    private String pushId;
-
-}

kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml

@@ -14,6 +14,11 @@
 	<description>kicc 通用业务模块</description>
 
 	<dependencies>
+		<!--oss文件管理-->
+		<dependency>
+			<groupId>com.pig4cloud.plugin</groupId>
+			<artifactId>oss-spring-boot-starter</artifactId>
+		</dependency>
 		<!--common api模块-->
 		<dependency>
 			<groupId>com.cloud</groupId>

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

@@ -43,7 +43,7 @@ import java.util.Map;
 public class MapTaskController {
 
     private final IMapTaskService iMapTaskService;
-    private final IMessageService iMessageService;
+    private final IPushMessageService iPushMessageService;
     private final OkHttpClient okHttpClient;
     private final IMapLogisticService iMapLogisticService;
     private final RemoteUserService remoteUserService;
@@ -128,11 +128,11 @@ public class MapTaskController {
     @ApiOperation(value = "设置预设点")
     public R setPresetPoint(@RequestBody MapLogisticPoint mapLogisticPoint) {
         String content = JSONObject.toJSONString(mapLogisticPoint);
-        Message message = new Message();
+        PushMessage pushMessage = new PushMessage();
-        message.setRemarks(content);
+        pushMessage.setRemarks(content);
-        message.setTitle(SecurityUtils.getUser().getUsername() + "与你对接预设点");
+        pushMessage.setTitle(SecurityUtils.getUser().getUsername() + "与你对接预设点");
         // 保存交接消息
-        iMessageService.save(message);
+        iPushMessageService.save(pushMessage);
         // todo: 调用友盟推送接口,目前未测试需要安卓上线平台,后面处理
 
         return R.ok();
@@ -140,11 +140,11 @@ public class MapTaskController {
 
     @PutMapping("/confirmPresetPoint")
     @ApiOperation(value = "确认预设点")
-    public R confirmPresetPoint(@RequestBody Message message) {
+    public R confirmPresetPoint(@RequestBody PushMessage pushMessage) {
-        if (!JSONUtil.isJson(message.getRemarks())) return R.error("当前消息体内不是json数据,请检查后重试!");
+        if (!JSONUtil.isJson(pushMessage.getRemarks())) return R.error("当前消息体内不是json数据,请检查后重试!");
-        MapLogisticPoint mapLogisticPoint = JSONObject.parseObject(message.getRemarks(), MapLogisticPoint.class);
+        MapLogisticPoint mapLogisticPoint = JSONObject.parseObject(pushMessage.getRemarks(), MapLogisticPoint.class);
         iMapTaskService.confirmPresetPoint(mapLogisticPoint);
-        iMessageService.removeById(message.getId());
+        iPushMessageService.removeById(pushMessage.getId());
         return R.ok();
     }
 

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

@@ -1,77 +0,0 @@
-package com.cloud.kicc.commonbiz.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.cloud.kicc.common.core.api.R;
-import com.cloud.kicc.common.core.constant.AppConstants;
-import com.cloud.kicc.commonbiz.api.entity.Message;
-import com.cloud.kicc.commonbiz.service.IMessageService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author entfrm开发团队-王翔
- * @since 2022-11-15
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON +"/message")
-@RequiredArgsConstructor
-@Api(tags = "消息模块")
-public class MessageController {
-
-    private final IMessageService iMessageService;
-
-    private LambdaQueryWrapper<Message> getQueryWrapper(Message message) {
-        return new LambdaQueryWrapper<Message>()
-                .eq(StrUtil.isNotBlank(message.getStatus()), Message::getStatus, message.getStatus())
-                .eq(StrUtil.isNotBlank(message.getType()), Message::getType, message.getType());
-    }
-
-    @GetMapping("/list")
-    @ApiOperation(value = "分页查询", notes = "分页查询")
-    public R list(Page page, Message message) {
-        IPage<Message> result = iMessageService.page(page, getQueryWrapper(message));
-        return R.ok(result.getRecords(), result.getTotal());
-    }
-
-    @GetMapping("/{id:\\w+}")
-    @ApiOperation(value = "根据id获取", notes = "根据id获取")
-    public R getById(@PathVariable("id") String id) {
-        Message message = iMessageService.getById(id);
-        return R.ok(message);
-    }
-
-    @PostMapping("/save")
-    @ApiOperation(value = "保存", notes = "保存")
-    public R save(@RequestBody Message message) {
-        iMessageService.save(message);
-        return R.ok();
-    }
-
-    @PutMapping("/update")
-    @ApiOperation(value = "修改", notes = "修改")
-    public R update(@RequestBody Message message) {
-        iMessageService.updateById(message);
-        return R.ok();
-    }
-
-    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    @ApiOperation(value = "删除", notes = "删除")
-    public R remove(@PathVariable String[] ids) {
-        iMessageService.removeByIds(Arrays.asList(ids));
-        return R.ok();
-    }
-
-}
-

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

@@ -7,17 +7,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
-import com.cloud.kicc.common.log.annotation.SysLog;
+import com.cloud.kicc.commonbiz.api.entity.PushMessage;
-import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
-import com.cloud.kicc.commonbiz.api.entity.Message;
 import com.cloud.kicc.commonbiz.api.entity.PushApplication;
 import com.cloud.kicc.commonbiz.service.IPushApplicationService;
 import com.cloud.kicc.system.api.entity.OauthClientDetails;
-import com.google.gson.JsonObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -79,14 +75,12 @@ public class PushApplicationController {
         return R.ok();
     }
 
-
     @PostMapping("/send")
     @ApiOperation(value = "消息发送")
-    public R mapPresetPointConfirmPushMsgTest(@Valid @RequestBody Message message) {
+    public R mapPresetPointConfirmPushMsgTest(@Valid @RequestBody PushMessage pushMessage) {
-        iPushApplicationService.messageSend(message);
+        iPushApplicationService.messageSend(pushMessage);
         return R.ok(true);
     }
 
-
 }
 

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

@@ -0,0 +1,60 @@
+package com.cloud.kicc.commonbiz.controller;
+
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cloud.kicc.common.core.api.R;
+import com.cloud.kicc.common.core.constant.AppConstants;
+import com.cloud.kicc.commonbiz.api.entity.PushFile;
+import com.cloud.kicc.commonbiz.service.IPushFileService;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-02-26
+ */
+@RestController
+@RequestMapping(AppConstants.APP_COMMON + "/pushFile")
+@RequiredArgsConstructor
+public class PushFileController {
+
+    private final IPushFileService iPushFileService;
+
+    private LambdaQueryWrapper<PushFile> getQueryWrapper(PushFile pushFile) {
+        return new LambdaQueryWrapper<PushFile>()
+                .like(StrUtil.isNotBlank(pushFile.getFileName()), PushFile::getFileName, pushFile.getFileName());
+    }
+
+    @GetMapping("/list")
+    @ApiOperation(value = "分页查询")
+    public R list(Page page, PushFile pushFile) {
+        IPage<PushFile> list = iPushFileService.page(page, getQueryWrapper(pushFile));
+        return R.ok(list.getRecords(), list.getTotal());
+    }
+
+    @PostMapping("/upload")
+    public Map upload(@RequestPart("file") MultipartFile file) {
+        return iPushFileService.uploadFile(file);
+    }
+
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    @ApiOperation(value = "删除文件")
+    public R remove(@PathVariable String[] ids) {
+        for (int i = 0; i < ids.length; ++i)
+            iPushFileService.deleteFile(ids[i]);
+        return R.ok();
+    }
+
+}
+

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

@@ -0,0 +1,78 @@
+package com.cloud.kicc.commonbiz.controller;
+
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cloud.kicc.common.core.api.R;
+import com.cloud.kicc.common.core.constant.AppConstants;
+import com.cloud.kicc.commonbiz.api.entity.PushMessage;
+import com.cloud.kicc.commonbiz.service.IPushMessageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-11-15
+ */
+@RestController
+@RequestMapping(AppConstants.APP_COMMON +"/pushMessage")
+@RequiredArgsConstructor
+@Api(tags = "消息模块")
+public class PushMessageController {
+
+    private final IPushMessageService iPushMessageService;
+
+    private LambdaQueryWrapper<PushMessage> getQueryWrapper(PushMessage pushMessage) {
+        return new LambdaQueryWrapper<PushMessage>()
+                .eq(StrUtil.isNotBlank(pushMessage.getSendUserId()), PushMessage::getSendUserId, pushMessage.getSendUserId())
+                .like(StrUtil.isNotBlank(pushMessage.getAlias()), PushMessage::getAlias, pushMessage.getAlias())
+                .eq(StrUtil.isNotBlank(pushMessage.getTitle()), PushMessage::getTitle, pushMessage.getTitle());
+    }
+
+    @GetMapping("/list")
+    @ApiOperation(value = "分页查询")
+    public R list(Page page, PushMessage pushMessage) {
+        IPage<PushMessage> result = iPushMessageService.page(page, getQueryWrapper(pushMessage));
+        return R.ok(result.getRecords(), result.getTotal());
+    }
+
+    @GetMapping("/{id:\\w+}")
+    @ApiOperation(value = "根据id获取")
+    public R getById(@PathVariable("id") String id) {
+        PushMessage pushMessage = iPushMessageService.getById(id);
+        return R.ok(pushMessage);
+    }
+
+    @PostMapping("/save")
+    @ApiOperation(value = "保存")
+    public R save(@RequestBody PushMessage pushMessage) {
+        iPushMessageService.save(pushMessage);
+        return R.ok();
+    }
+
+    @PutMapping("/update")
+    @ApiOperation(value = "修改")
+    public R update(@RequestBody PushMessage pushMessage) {
+        iPushMessageService.updateById(pushMessage);
+        return R.ok();
+    }
+
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    @ApiOperation(value = "删除")
+    public R remove(@PathVariable String[] ids) {
+        iPushMessageService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+}
+

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

@@ -35,7 +35,8 @@ public class PushPassListController {
 
     private LambdaQueryWrapper<PushPassList> getQueryWrapper(PushPassList pushBlacklist) {
         return new LambdaQueryWrapper<PushPassList>()
-                .eq(StrUtil.isNotBlank(pushBlacklist.getPushManageId()), PushPassList::getPushManageId, pushBlacklist.getPushManageId())
+                .eq(StrUtil.isNotBlank(pushBlacklist.getToPushId()), PushPassList::getToPushId, pushBlacklist.getToPushId())
+                .eq(StrUtil.isNotBlank(pushBlacklist.getFromPushId()), PushPassList::getFromPushId, pushBlacklist.getFromPushId())
                 .eq(StrUtil.isNotBlank(pushBlacklist.getType()), PushPassList::getType, pushBlacklist.getType());
     }
 

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

@@ -1,80 +0,0 @@
-package com.cloud.kicc.commonbiz.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.cloud.kicc.common.core.api.R;
-import com.cloud.kicc.common.core.constant.AppConstants;
-import com.cloud.kicc.commonbiz.api.entity.PushRecord;
-import com.cloud.kicc.commonbiz.api.entity.PushThirdParty;
-import com.cloud.kicc.commonbiz.service.IPushRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.Arrays;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-17
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushRecord")
-@RequiredArgsConstructor
-@Api(tags = "推送消息记录")
-public class PushRecordController {
-
-    private final IPushRecordService iPushRecordService;
-
-    private LambdaQueryWrapper<PushRecord> getQueryWrapper(PushRecord pushRecord) {
-        return new LambdaQueryWrapper<PushRecord>()
-                .like(StrUtil.isNotBlank(pushRecord.getTitle()), PushRecord::getTitle, pushRecord.getTitle())
-                .eq(StrUtil.isNotBlank(pushRecord.getApplicationId()), PushRecord::getApplicationId, pushRecord.getApplicationId())
-                .eq(StrUtil.isNotBlank(pushRecord.getAliasUserId()), PushRecord::getAliasUserId, pushRecord.getAliasUserId())
-                .eq(StrUtil.isNotBlank(pushRecord.getAliasType()), PushRecord::getAliasType, pushRecord.getAliasType());
-    }
-
-    @ApiOperation("分页查询")
-    @GetMapping("/list")
-    public R list(Page page, PushRecord pushRecord) {
-        IPage<PushThirdParty> list = iPushRecordService.page(page, getQueryWrapper(pushRecord));
-        return R.ok(list.getRecords(), list.getTotal());
-    }
-
-    @ApiOperation("根据ID查询")
-    @GetMapping("/{id:\\w+}")
-    public R getById(@PathVariable("id") String id) {
-        return R.ok(iPushRecordService.getById(id));
-    }
-
-    @ApiOperation("保存")
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody PushRecord pushRecord) {
-        iPushRecordService.save(pushRecord);
-        return R.ok();
-    }
-
-    @ApiOperation("修改")
-    @PutMapping("/update")
-    public R update(@Valid @RequestBody PushRecord pushRecord) {
-        iPushRecordService.updateById(pushRecord);
-        return R.ok();
-    }
-
-    @ApiOperation("删除")
-    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    public R<Boolean> removeById(@PathVariable String[] ids) {
-        iPushRecordService.removeByIds(Arrays.asList(ids));
-        return R.ok();
-    }
-
-}
-

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

@@ -39,7 +39,7 @@ public class PushThirdPartyController {
 
     private LambdaQueryWrapper<PushThirdParty> getQueryWrapper(PushThirdParty pushThirdParty) {
         return new LambdaQueryWrapper<PushThirdParty>()
-                .eq(StrUtil.isNotBlank(pushThirdParty.getEnterpName()), PushThirdParty::getEnterpName, pushThirdParty.getEnterpName())
+                .eq(StrUtil.isNotBlank(pushThirdParty.getEntName()), PushThirdParty::getEntName, pushThirdParty.getEntName())
                 .eq(StrUtil.isNotBlank(pushThirdParty.getStatus()), PushThirdParty::getStatus, pushThirdParty.getStatus());
     }
 

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

@@ -1,76 +0,0 @@
-package com.cloud.kicc.commonbiz.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.cloud.kicc.common.core.api.R;
-import com.cloud.kicc.common.core.constant.AppConstants;
-import com.cloud.kicc.commonbiz.api.entity.PushThirdPartyManage;
-import com.cloud.kicc.commonbiz.service.IPushThirdPartyManageService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.Arrays;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushThirdPartyManage")
-@RequiredArgsConstructor
-@Api(tags = "第三方管理")
-public class PushThirdPartyManageController {
-
-    private final IPushThirdPartyManageService iPushThirdPartyManageService;
-
-    private LambdaQueryWrapper<PushThirdPartyManage> getQueryWrapper(PushThirdPartyManage pushThirdPartyManage) {
-        return new LambdaQueryWrapper<PushThirdPartyManage>()
-                .eq(StrUtil.isNotBlank(pushThirdPartyManage.getEnterpName()), PushThirdPartyManage::getEnterpName, pushThirdPartyManage.getEnterpName());
-    }
-
-    @ApiOperation("分页查询")
-    @GetMapping("/list")
-    public R list(Page page, PushThirdPartyManage pushThirdPartyManage) {
-        IPage<PushThirdPartyManage> list = iPushThirdPartyManageService.page(page, getQueryWrapper(pushThirdPartyManage));
-        return R.ok(list.getRecords(), list.getTotal());
-    }
-
-    @ApiOperation("根据ID查询")
-    @GetMapping("/{id:\\w+}")
-    public R getById(@PathVariable("id") String id) {
-        return R.ok(iPushThirdPartyManageService.getById(id));
-    }
-
-    @ApiOperation("保存")
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody PushThirdPartyManage pushThirdPartyManage) {
-        iPushThirdPartyManageService.save(pushThirdPartyManage);
-        return R.ok();
-    }
-
-    @ApiOperation("修改")
-    @PutMapping("/update")
-    public R update(@Valid @RequestBody PushThirdPartyManage pushThirdPartyManage) {
-        iPushThirdPartyManageService.updateById(pushThirdPartyManage);
-        return R.ok();
-    }
-
-    @ApiOperation("删除")
-    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    public R<Boolean> removeById(@PathVariable String[] ids) {
-        iPushThirdPartyManageService.removeByIds(Arrays.asList(ids));
-        return R.ok();
-    }
-
-}
-

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

@@ -4,20 +4,17 @@ package com.cloud.kicc.commonbiz.controller;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
-import com.cloud.kicc.commonbiz.api.entity.PushThirdPartyManage;
 import com.cloud.kicc.commonbiz.api.entity.PushUserManage;
-import com.cloud.kicc.commonbiz.service.IPushThirdPartyManageService;
 import com.cloud.kicc.commonbiz.service.IPushUserManageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import org.springframework.stereotype.Controller;
-
 import javax.validation.Valid;
 import java.util.Arrays;
 
@@ -39,7 +36,10 @@ public class PushUserManageController {
 
     private LambdaQueryWrapper<PushUserManage> getQueryWrapper(PushUserManage pushUserManage) {
         return new LambdaQueryWrapper<PushUserManage>()
-                .eq(StrUtil.isNotBlank(pushUserManage.getNickName()), PushUserManage::getNickName, pushUserManage.getNickName());
+                .eq(StrUtil.isNotBlank(pushUserManage.getType()), PushUserManage::getType, pushUserManage.getType())
+                .eq(StrUtil.isNotBlank(pushUserManage.getCreateById()), PushUserManage::getCreateById, pushUserManage.getCreateById())
+                .eq(StrUtil.isNotBlank(pushUserManage.getToUserId()), PushUserManage::getToUserId, pushUserManage.getToUserId())
+                .like(StrUtil.isNotBlank(pushUserManage.getNickName()), PushUserManage::getNickName, pushUserManage.getNickName());
     }
 
     @ApiOperation("分页查询")
@@ -62,6 +62,15 @@ public class PushUserManageController {
         return R.ok();
     }
 
+    @ApiOperation("申请通过")
+    @PostMapping("/approved/{ids:[\\w,]+}")
+    public R approved(@PathVariable String[] ids) {
+        iPushUserManageService.update(Wrappers.<PushUserManage>lambdaUpdate()
+                .set(PushUserManage::getStatus, "1")
+                .in(PushUserManage::getId, ids));
+        return R.ok();
+    }
+
     @ApiOperation("修改")
     @PutMapping("/update")
     public R update(@Valid @RequestBody PushUserManage pushUserManage) {

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushFileMapper.java

@@ -1,6 +1,6 @@
 package com.cloud.kicc.commonbiz.mapper;
 
-import com.cloud.kicc.commonbiz.api.entity.PushRecord;
+import com.cloud.kicc.commonbiz.api.entity.PushFile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author wangxiang4
- * @since 2023-02-17
+ * @since 2023-02-26
  */
-public interface PushRecordMapper extends BaseMapper<PushRecord> {
+public interface PushFileMapper extends BaseMapper<PushFile> {
 
 }

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushMessageMapper.java

@@ -1,6 +1,6 @@
 package com.cloud.kicc.commonbiz.mapper;
 
-import com.cloud.kicc.commonbiz.api.entity.Message;
+import com.cloud.kicc.commonbiz.api.entity.PushMessage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author entfrm开发团队-王翔
  * @since 2022-11-15
  */
-public interface MessageMapper extends BaseMapper<Message> {
+public interface PushMessageMapper extends BaseMapper<PushMessage> {
 
 }

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushThirdPartyManageMapper.java

@@ -1,16 +0,0 @@
-package com.cloud.kicc.commonbiz.mapper;
-
-import com.cloud.kicc.commonbiz.api.entity.PushThirdPartyManage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-public interface PushThirdPartyManageMapper extends BaseMapper<PushThirdPartyManage> {
-
-}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/UserPushMapper.java

@@ -1,16 +0,0 @@
-package com.cloud.kicc.commonbiz.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cloud.kicc.commonbiz.api.entity.UserPush;
-
-/**
- *<p>
- * Mapper 接口
- *</p>
- *
- * @Author: entfrm开发团队-王翔
- * @Date: 2022/2/24
- */
-public interface UserPushMapper extends BaseMapper<UserPush> {
-
-}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushApplicationService.java

@@ -1,7 +1,7 @@
 package com.cloud.kicc.commonbiz.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.cloud.kicc.commonbiz.api.entity.Message;
+import com.cloud.kicc.commonbiz.api.entity.PushMessage;
 import com.cloud.kicc.commonbiz.api.entity.PushApplication;
 
 /**
@@ -19,6 +19,6 @@ public interface IPushApplicationService extends IService<PushApplication> {
      * @param
      * @return
      */
-    void messageSend(Message message);
+    void messageSend(PushMessage pushMessage);
 
 }

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushFileService.java

@@ -0,0 +1,33 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cloud.kicc.commonbiz.api.entity.PushFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-02-26
+ */
+public interface IPushFileService extends IService<PushFile> {
+
+    /**
+     * 上传文件
+     * @param file
+     * @return
+     */
+    Map uploadFile(MultipartFile file);
+
+    /**
+     * 删除文件
+     * @param id
+     * @return Boolean
+     */
+    void deleteFile(String id);
+
+}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushMessageService.java

@@ -1,6 +1,6 @@
 package com.cloud.kicc.commonbiz.service;
 
-import com.cloud.kicc.commonbiz.api.entity.Message;
+import com.cloud.kicc.commonbiz.api.entity.PushMessage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author entfrm开发团队-王翔
  * @since 2022-11-15
  */
-public interface IMessageService extends IService<Message> {
+public interface IPushMessageService extends IService<PushMessage> {
 
 }

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushRecordService.java

@@ -1,16 +0,0 @@
-package com.cloud.kicc.commonbiz.service;
-
-import com.cloud.kicc.commonbiz.api.entity.PushRecord;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-17
- */
-public interface IPushRecordService extends IService<PushRecord> {
-
-}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushThirdPartyManageService.java

@@ -1,16 +0,0 @@
-package com.cloud.kicc.commonbiz.service;
-
-import com.cloud.kicc.commonbiz.api.entity.PushThirdPartyManage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-public interface IPushThirdPartyManageService extends IService<PushThirdPartyManage> {
-
-}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/UserPushService.java

@@ -1,16 +0,0 @@
-package com.cloud.kicc.commonbiz.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.cloud.kicc.commonbiz.api.entity.UserPush;
-
-/**
- *<p>
- * 服务类
- *</p>
- *
- * @Author: entfrm开发团队-王翔
- * @Date: 2022/2/24
- */
-public interface UserPushService extends IService<UserPush> {
-
-}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MessageServiceImpl.java

@@ -1,20 +0,0 @@
-package com.cloud.kicc.commonbiz.service.impl;
-
-import com.cloud.kicc.commonbiz.api.entity.Message;
-import com.cloud.kicc.commonbiz.mapper.MessageMapper;
-import com.cloud.kicc.commonbiz.service.IMessageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author entfrm开发团队-王翔
- * @since 2022-11-15
- */
-@Service
-public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
-
-}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java

@@ -10,20 +10,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.SecurityConstants;
 import com.cloud.kicc.common.core.exception.CheckedException;
-import com.cloud.kicc.commonbiz.api.entity.Message;
 import com.cloud.kicc.commonbiz.api.entity.PushApplication;
 import com.cloud.kicc.commonbiz.api.entity.PushCustomType;
-import com.cloud.kicc.commonbiz.api.entity.UserPush;
+import com.cloud.kicc.commonbiz.api.entity.PushMessage;
+import com.cloud.kicc.commonbiz.api.entity.PushUserManage;
 import com.cloud.kicc.commonbiz.mapper.PushApplicationMapper;
 import com.cloud.kicc.commonbiz.service.IPushApplicationService;
 import com.cloud.kicc.commonbiz.service.IPushCustomTypeService;
-import com.cloud.kicc.commonbiz.service.UserPushService;
+import com.cloud.kicc.commonbiz.service.IPushMessageService;
+import com.cloud.kicc.commonbiz.service.IPushUserManageService;
 import com.cloud.kicc.commonbiz.util.PushClientUtil;
 import com.cloud.kicc.system.api.entity.User;
 import com.cloud.kicc.system.api.feign.RemoteUserService;
 import lombok.RequiredArgsConstructor;
 import okhttp3.OkHttpClient;
-import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -50,22 +50,23 @@ import java.util.stream.Collectors;
 public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMapper, PushApplication> implements IPushApplicationService {
 
     private final OkHttpClient okHttpClient;
-    private final UserPushService userPushService;
+    private final IPushUserManageService iPushUserManageService;
+    private final IPushMessageService iPushMessageService;
     private final RemoteUserService remoteUserService;
     private final IPushCustomTypeService iPushCustomTypeService;
 
     @Override
-    public void messageSend(Message message) {
+    public void messageSend(PushMessage pushMessage) {
 
-        if (StrUtil.isBlank(message.getSendUserId()) || StrUtil.isBlank(message.getMessageSecret())) {
+        if (StrUtil.isBlank(pushMessage.getSendUserId()) || StrUtil.isBlank(pushMessage.getMessageSecret())) {
             throw new CheckedException("当前发送用户ID与推送应用密钥必填!");
         }
-        R<User> user = remoteUserService.selectByUserId(message.getSendUserId(), SecurityConstants.FROM_IN);
+        R<User> user = remoteUserService.selectByUserId(pushMessage.getSendUserId(), SecurityConstants.FROM_IN);
 
         // 第三方发送前较验数据
         if (user.getData().getUserType().equals("9")) {
             PushApplication pushApplication = baseMapper.selectOne(Wrappers.<PushApplication>lambdaQuery()
-                    .eq(PushApplication::getMessageSecret, message.getMessageSecret()).eq(PushApplication::getStatus, "0"));
+                    .eq(PushApplication::getMessageSecret, pushMessage.getMessageSecret()).eq(PushApplication::getStatus, "0"));
             pushApplication = Optional.of(pushApplication).orElseThrow(() -> new CheckedException("你当前没有权限发送消息，请联系管理员!"));
             HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
             // 如果ip地址存在即验证发送方ip
@@ -76,43 +77,44 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
 
         // 查询当前用户设置的自定义快捷方式消息提醒属性
         PushCustomType pushCustomType = iPushCustomTypeService.getOne(Wrappers.<PushCustomType>lambdaQuery()
-                .eq(PushCustomType::getId, message.getCustomTypeId()).eq(PushCustomType::getCreateById, message.getSendUserId()));
+                .eq(PushCustomType::getId, pushMessage.getCustomTypeId()).eq(PushCustomType::getCreateById, pushMessage.getSendUserId()));
         if (ObjectUtil.isNotEmpty(pushCustomType)) {
-            message.setPlaySound(pushCustomType.getPlaySound());
+            pushMessage.setPlaySound(pushCustomType.getPlaySound());
-            message.setPlayVibrate(pushCustomType.getPlayVibrate());
+            pushMessage.setPlayVibrate(pushCustomType.getPlayVibrate());
-            message.setPlayLights(pushCustomType.getPlayLights());
+            pushMessage.setPlayLights(pushCustomType.getPlayLights());
             if (StrUtil.isNotBlank(pushCustomType.getCustomPlayFileName()))
-            message.setCustomPlayFileName(pushCustomType.getCustomPlayFileName());
+            pushMessage.setCustomPlayFileName(pushCustomType.getCustomPlayFileName());
         }
 
-        List<UserPush> pushList = userPushService.list(Wrappers.<UserPush>lambdaQuery().eq(UserPush::getUserId, message.getSendUserId()));
+        List<PushUserManage> pushList = iPushUserManageService.list(Wrappers.<PushUserManage>lambdaQuery()
+                .eq(PushUserManage::getCreateById, pushMessage.getSendUserId()).eq(PushUserManage::getStatus, "1"));
         if (ObjectUtil.isNotEmpty(pushList)) {
             // 设置默认数据
-            message.setDisplayType("notification");
+            pushMessage.setDisplayType("notification");
-            message.setAliasType(PushClientUtil.uPushUserAliasType);
+            pushMessage.setAliasType(PushClientUtil.uPushUserAliasType);
-            message.setAlias(pushList.stream().map(item -> item.getPushId()).collect(Collectors.joining(",")));
+            pushMessage.setAlias(pushList.stream().map(item -> item.getToUserId()).collect(Collectors.joining(",")));
             JSONObject custom = new JSONObject();
-            custom.put("sendUserId", message.getSendUserId());
+            custom.put("sendUserId", pushMessage.getSendUserId());
-            custom.put("customPlayFileName", message.getCustomPlayFileName());
+            custom.put("customPlayFileName", pushMessage.getCustomPlayFileName());
-            message.setCustom(custom.toString());
+            pushMessage.setCustom(custom.toString());
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("production_mode", PushClientUtil.PRODUCTION_MODE);
             jsonObject.put("type", "customizedcast");
-            jsonObject.put("description", message.getRemarks());
+            jsonObject.put("description", pushMessage.getRemarks());
-            jsonObject.put("alias_type", message.getAliasType());
+            jsonObject.put("alias_type", pushMessage.getAliasType());
-            jsonObject.put("alias", message.getAlias());
+            jsonObject.put("alias", pushMessage.getAlias());
             JSONObject payload = new JSONObject();
-            payload.put("display_type", message.getDisplayType());
+            payload.put("display_type", pushMessage.getDisplayType());
             JSONObject body = new JSONObject();
-            body.put("ticker", message.getTitle());
+            body.put("ticker", pushMessage.getTitle());
-            body.put("text", message.getText());
+            body.put("text", pushMessage.getText());
-            body.put("title", message.getTitle());
+            body.put("title", pushMessage.getTitle());
-            body.put("sound", message.getSound());
+            body.put("sound", pushMessage.getSound());
             body.put("after_open", "go_custom");
-            body.put("custom", message.getCustom());
+            body.put("custom", pushMessage.getCustom());
-            body.put("play_sound", message.getPlaySound());
+            body.put("play_sound", pushMessage.getPlaySound());
-            body.put("play_vibrate", message.getPlayVibrate());
+            body.put("play_vibrate", pushMessage.getPlayVibrate());
-            body.put("play_lights", message.getPlayLights());
+            body.put("play_lights", pushMessage.getPlayLights());
             payload.put("body", body);
             jsonObject.put("payload", payload);
             JSONObject policy = new JSONObject();
@@ -122,6 +124,7 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
             try {
                 PushClientUtil pushClientUtil = new PushClientUtil(okHttpClient);
                 pushClientUtil.send(jsonObject);
+                iPushMessageService.save(pushMessage);
             } catch (Exception e) {
                 e.printStackTrace();
             }

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushFileServiceImpl.java

@@ -0,0 +1,72 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cloud.kicc.common.core.exception.CheckedException;
+import com.cloud.kicc.commonbiz.api.entity.PushFile;
+import com.cloud.kicc.commonbiz.mapper.PushFileMapper;
+import com.cloud.kicc.commonbiz.service.IPushFileService;
+import com.pig4cloud.plugin.oss.OssProperties;
+import com.pig4cloud.plugin.oss.service.OssTemplate;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-02-26
+ */
+@Service
+@RequiredArgsConstructor
+public class PushFileServiceImpl extends ServiceImpl<PushFileMapper, PushFile> implements IPushFileService {
+
+    private final OssProperties ossProperties;
+    private final OssTemplate ossTemplate;
+
+    @Override
+    public Map uploadFile(MultipartFile file) {
+        String fileName = IdUtil.simpleUUID() + StrUtil.DOT + FileUtil.extName(file.getOriginalFilename());
+        Map<String, String> resultMap = new HashMap<>(4);
+        resultMap.put("bucketName", ossProperties.getBucketName());
+        resultMap.put("fileName", fileName);
+        resultMap.put("url", String.format("/system_proxy/system/file/getFile/%s/%s", ossProperties.getBucketName(), fileName));
+        try {
+            ossTemplate.putObject(ossProperties.getBucketName(), fileName, file.getContentType(), file.getInputStream());
+            super.save(new PushFile()
+                    .setFileUrl(resultMap.get("url"))
+                    .setFileName(fileName)
+                    .setOriginal(file.getOriginalFilename())
+                    .setFileSize(file.getSize())
+                    .setType(FileUtil.extName(file.getOriginalFilename()))
+                    .setBucketName(ossProperties.getBucketName())
+            );
+        } catch (Exception e) {
+            throw new CheckedException("上传失败");
+        }
+        return resultMap;
+    }
+
+    @Override
+    @SneakyThrows
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteFile(String id) {
+        PushFile file = super.getById(id);
+        if (ObjectUtil.isNotEmpty(file)) {
+            ossTemplate.removeObject(ossProperties.getBucketName(), file.getFileName());
+            this.removeById(id);
+        }
+    }
+
+}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushMessageServiceImpl.java

@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.cloud.kicc.commonbiz.api.entity.PushMessage;
+import com.cloud.kicc.commonbiz.mapper.PushMessageMapper;
+import com.cloud.kicc.commonbiz.service.IPushMessageService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-11-15
+ */
+@Service
+public class PushMessageServiceImpl extends ServiceImpl<PushMessageMapper, PushMessage> implements IPushMessageService {
+
+}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushRecordServiceImpl.java

@@ -1,20 +0,0 @@
-package com.cloud.kicc.commonbiz.service.impl;
-
-import com.cloud.kicc.commonbiz.api.entity.PushRecord;
-import com.cloud.kicc.commonbiz.mapper.PushRecordMapper;
-import com.cloud.kicc.commonbiz.service.IPushRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-17
- */
-@Service
-public class PushRecordServiceImpl extends ServiceImpl<PushRecordMapper, PushRecord> implements IPushRecordService {
-
-}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushThirdPartyManageServiceImpl.java

@@ -1,20 +0,0 @@
-package com.cloud.kicc.commonbiz.service.impl;
-
-import com.cloud.kicc.commonbiz.api.entity.PushThirdPartyManage;
-import com.cloud.kicc.commonbiz.mapper.PushThirdPartyManageMapper;
-import com.cloud.kicc.commonbiz.service.IPushThirdPartyManageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@Service
-public class PushThirdPartyManageServiceImpl extends ServiceImpl<PushThirdPartyManageMapper, PushThirdPartyManage> implements IPushThirdPartyManageService {
-
-}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/UserPushServiceImpl.java

@@ -1,20 +0,0 @@
-package com.cloud.kicc.commonbiz.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cloud.kicc.commonbiz.api.entity.UserPush;
-import com.cloud.kicc.commonbiz.mapper.UserPushMapper;
-import com.cloud.kicc.commonbiz.service.UserPushService;
-import org.springframework.stereotype.Service;
-
-/**
- *<p>
- * 服务实现类
- *</p>
- *
- * @Author: entfrm开发团队-王翔
- * @Date: 2022/2/24
- */
-@Service
-public class UserPushServiceImpl extends ServiceImpl<UserPushMapper, UserPush> implements UserPushService {
-
-}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushCertificationMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushCertificationMapper">
-
-</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushFileMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cloud.kicc.commonbiz.mapper.UserPushMapper">
+<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushFileMapper">
 
 </mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushManageMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushManageMapper">
-
-</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushMessageMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cloud.kicc.commonbiz.mapper.MessageMapper">
+<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushMessageMapper">
 
 </mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushRecordMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushRecordMapper">
-
-</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushThirdPartyManageMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushThirdPartyManageMapper">
-
-</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushTodoAuthMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushTodoAuthMapper">
-
-</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushTypeMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushTypeMapper">
-
-</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushWhitelistMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushWhitelistMapper">
-
-</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/test/SimpleCrudGeneratorTest.java

@@ -44,7 +44,7 @@ public class SimpleCrudGeneratorTest {
 
         String packageController = "controller";
 
-        String[] includeTable = { "common_push_record" };
+        String[] includeTable = { "common_push_file" };
 
         String[] filterEntityTablePrefix = { "common_" };