refactor: 消息推送

kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/config/MybatisConfiguration.java

@@ -1,6 +1,8 @@
 package com.cloud.kicc.common.data.config;
 
+import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.baomidou.mybatisplus.extension.MybatisMapWrapperFactory;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.cloud.kicc.common.core.factory.YamlPropertySourceFactory;
@@ -57,4 +59,9 @@ public class MybatisConfiguration implements WebMvcConfigurer {
 		return new BaseMetaObjectHandler();
 	}
 
+	@Bean
+	public ConfigurationCustomizer mybatisConfigurationCustomizer(){
+		return configuration -> configuration.setObjectWrapperFactory(new MybatisMapWrapperFactory());
+	}
+
 }

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

@@ -2,38 +2,39 @@ 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.Data;
-import lombok.Setter;
 import lombok.experimental.Accessors;
 
 /**
  * <p>
- *
+ * 推送应用表
  * </p>
  *
  * @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
  */
-@Getter
+@Data
-@Setter
 @Accessors(chain = true)
 @TableName("common_push_application")
-@ApiModel(value = "PushApplication对象")
+@ApiModel(value = "PushApplication对象", description = "推送应用表")
 public class PushApplication extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 
     private String id;
 
+    @ApiModelProperty("应用名称")
     private String name;
 
+    @ApiModelProperty("应用状态")
     private String status;
 
-    private String ip;
+    @ApiModelProperty("限制请求ip")
+    private String ignoreIp;
 
+    @ApiModelProperty("消息发送密钥")
     private String messageSecret;
 
 }

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

@@ -0,0 +1,35 @@
+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.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 黑名单表
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Data
+@Accessors(chain = true)
+@TableName("common_push_blacklist")
+@ApiModel(value = "PushBlacklist对象", description = "黑名单表")
+public class PushBlacklist implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("关注用户")
+    private String concernUserId;
+
+    @ApiModelProperty("粉丝用户")
+    private String fanUserId;
+
+}

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

@@ -3,42 +3,48 @@ package com.cloud.kicc.commonbiz.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 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.Data;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 消息发送
+ * 聊天消息表
  * </p>
  *
- * @author entfrm开发团队-王翔
+ * @author wangxiang4
- * @since 2022-11-15
+ * @since 2023-03-24
  */
 @Data
 @Accessors(chain = true)
-@TableName("common_push_message")
+@TableName("common_push_chat_message")
-@ApiModel(value = "Message对象")
+@ApiModel(value = "PushChatMessage对象", description = "聊天消息表")
-public class PushMessage extends CommonEntity {
+public class PushChatMessage extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键id")
     private String id;
 
-    @ApiModelProperty("发送方用户id")
+    @ApiModelProperty("推送方用户id")
-    private String fromUserId;
+    private String userId;
+
+    @ApiModelProperty("推送用户id")
+    private String pushUserId;
 
     @ApiModelProperty("消息类型")
     private String type;
 
-    @ApiModelProperty("自定义推送类型ID")
+    @ApiModelProperty("消息状态 0-需要审核 1-未读 2-已读")
-    private String customTypeId;
-
-    @ApiModelProperty("消息状态 0-未读 1-已读")
     private String status;
 
+    @ApiModelProperty("推送类型id")
+    private String pushTypeId;
+
     @ApiModelProperty("别名类型")
     private String aliasType;
 
@@ -66,8 +72,8 @@ public class PushMessage extends CommonEntity {
     @ApiModelProperty("收到通知是否发出声音")
     private String playSound;
 
-    @ApiModelProperty("自定义播放文件名称")
+    @ApiModelProperty("在线铃声")
-    private String customPlayFileName;
+    private String onlineRingtone;
 
     @ApiModelProperty("自定义活动点击跳转内容")
     private String custom;

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

@@ -0,0 +1,40 @@
+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-03-24
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("common_push_concern_fan")
+@ApiModel(value = "PushConcernFan对象", description = "关注粉丝表")
+public class PushConcernFan extends CommonEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    @ApiModelProperty("关注用户")
+    private String concernUserId;
+
+    @ApiModelProperty("粉丝用户")
+    private String fanUserId;
+
+    @ApiModelProperty("0-需要审核 1-审核通过")
+    private String status;
+
+}

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

@@ -0,0 +1,60 @@
+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-03-24
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("common_push_concern_fan_type")
+@ApiModel(value = "PushConcernFanType对象", description = "推送关注粉丝跟类型关联表")
+public class PushConcernFanType extends CommonEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    @ApiModelProperty("类型名称")
+    private String name;
+
+    @ApiModelProperty("用户ID")
+    private String userId;
+
+    @ApiModelProperty("推送类型ID")
+    private String typeId;
+
+    @ApiModelProperty("默认类型")
+    private String defaultType;
+
+    @ApiModelProperty("是否播放声音")
+    private String playSound;
+
+    @ApiModelProperty("是否震动")
+    private String playVibrate;
+
+    @ApiModelProperty("是否闪光")
+    private String playLights;
+
+    @ApiModelProperty("是否播报文字")
+    private String playToText;
+
+    @ApiModelProperty("在线铃声")
+    private String onlineRingtone;
+
+    @ApiModelProperty("离线铃声")
+    private String offlineRingtone;
+
+}

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

@@ -11,48 +11,48 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- *
+ * 第三方企业资料表
  * </p>
  *
  * @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
  */
 @Getter
 @Setter
 @Accessors(chain = true)
-@TableName("common_push_third_party")
+@TableName("common_push_enterprise")
-@ApiModel(value = "PushThirdParty对象")
+@ApiModel(value = "PushEnterprise对象", description = "第三方企业资料表")
-public class PushThirdParty extends CommonEntity {
+public class PushEnterprise extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 
     private String id;
 
-    @ApiModelProperty("法定代表人姓名")
-    private String statutoryRepName;
-
-    @ApiModelProperty("法定代表人身份证")
-    private String idCard;
-
     @ApiModelProperty("企业名称")
-    private String entName;
+    private String name;
 
-    @ApiModelProperty("营业执照文件")
+    @ApiModelProperty("法定代表人姓名")
-    private String licenseFileId;
+    private String repName;
 
     @ApiModelProperty("法定代表人手机号")
     private String phone;
 
+    @ApiModelProperty("营业执照")
+    private String license;
+
+    @ApiModelProperty("绑定用户ID")
+    private String userId;
+
     @ApiModelProperty("统一社会信用代码")
     private String creditCode;
 
-    @ApiModelProperty("用户ID")
+    @ApiModelProperty("法定代表人身份证")
-    private String userId;
+    private String idCard;
+
+    @ApiModelProperty("0-待审核 1-审核通过")
+    private String status;
 
     @ApiModelProperty("详细地址")
     private String detailedAddress;
 
-    @ApiModelProperty("申请状态")
-    private String status;
-
 }

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

@@ -1,48 +0,0 @@
-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/PushRingtone.java

@@ -2,34 +2,36 @@ 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
+ * @since 2023-03-24
  */
 @Getter
 @Setter
 @Accessors(chain = true)
-@TableName("common_push_pass_list")
+@TableName("common_push_ringtone")
-@ApiModel(value = "PushPassList对象")
+@ApiModel(value = "PushRingtone对象", description = "在线铃声表")
-public class PushPassList extends CommonEntity {
+public class PushRingtone extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 
     private String id;
 
-    private String fromPushId;
+    @ApiModelProperty("铃声名称")
-
+    private String name;
-    private String toPushId;
 
-    private String type;
+    @ApiModelProperty("铃声")
+    private String ringtone;
 
 }

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

@@ -11,18 +11,18 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 自定义消息类型
+ * 推送类型
  * </p>
  *
  * @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
  */
 @Getter
 @Setter
 @Accessors(chain = true)
-@TableName("common_push_custom_type")
+@TableName("common_push_type")
-@ApiModel(value = "PushCustomType对象")
+@ApiModel(value = "PushType对象", description = "推送类型")
-public class PushCustomType extends CommonEntity {
+public class PushType extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -40,7 +40,13 @@ public class PushCustomType extends CommonEntity {
     @ApiModelProperty("是否闪光")
     private String playLights;
 
+    @ApiModelProperty("是否播报文字")
+    private String playToText;
+
+    @ApiModelProperty("自定义播放文件名称")
+    private String onlineRingtone;
+
     @ApiModelProperty("自定义播放文件名称")
-    private String customPlayFileName;
+    private String offlineRingtone;
 
 }

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

@@ -1,55 +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_user_manage")
-@ApiModel(value = "PushUserManage对象")
-public class PushUserManage extends CommonEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    @ApiModelProperty("对方用户id")
-    private String toUserId;
-
-    @ApiModelProperty("发送方用户id")
-    private String fromUserId;
-
-    @ApiModelProperty("用户名称")
-    private String userName;
-
-    @ApiModelProperty("状态")
-    private String status;
-
-    @ApiModelProperty("是否播放声音")
-    private String playSound;
-
-    @ApiModelProperty("是否震动")
-    private String playVibrate;
-
-    @ApiModelProperty("是否闪光")
-    private String playLights;
-
-    @ApiModelProperty("推送列表类型")
-    private String type;
-
-}

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

@@ -15,6 +15,7 @@ import com.cloud.kicc.commonbiz.api.entity.*;
 import com.cloud.kicc.commonbiz.service.*;
 import com.cloud.kicc.system.api.entity.User;
 import com.cloud.kicc.system.api.feign.RemoteUserService;
+import io.lettuce.core.api.push.PushMessage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -43,7 +44,7 @@ import java.util.Map;
 public class MapTaskController {
 
     private final IMapTaskService iMapTaskService;
-    private final IPushMessageService iPushMessageService;
+    private final IPushChatMessageService iPushChatMessageService;
     private final OkHttpClient okHttpClient;
     private final IMapLogisticService iMapLogisticService;
     private final RemoteUserService remoteUserService;
@@ -128,11 +129,11 @@ public class MapTaskController {
     @ApiOperation(value = "设置预设点")
     public R setPresetPoint(@RequestBody MapLogisticPoint mapLogisticPoint) {
         String content = JSONObject.toJSONString(mapLogisticPoint);
-        PushMessage pushMessage = new PushMessage();
+        PushChatMessage pushChatMessage = new PushChatMessage();
-        pushMessage.setRemarks(content);
+        pushChatMessage.setRemarks(content);
-        pushMessage.setTitle(SecurityUtils.getUser().getUsername() + "与你对接预设点");
+        pushChatMessage.setTitle(SecurityUtils.getUser().getUsername() + "与你对接预设点");
         // 保存交接消息
-        iPushMessageService.save(pushMessage);
+        iPushChatMessageService.save(pushChatMessage);
         // todo: 调用友盟推送接口,目前未测试需要安卓上线平台,后面处理
 
         return R.ok();
@@ -140,11 +141,11 @@ public class MapTaskController {
 
     @PutMapping("/confirmPresetPoint")
     @ApiOperation(value = "确认预设点")
-    public R confirmPresetPoint(@RequestBody PushMessage pushMessage) {
+    public R confirmPresetPoint(@RequestBody PushChatMessage pushChatMessage) {
-        if (!JSONUtil.isJson(pushMessage.getRemarks())) return R.error("当前消息体内不是json数据,请检查后重试!");
+        if (!JSONUtil.isJson(pushChatMessage.getRemarks())) return R.error("当前消息体内不是json数据,请检查后重试!");
-        MapLogisticPoint mapLogisticPoint = JSONObject.parseObject(pushMessage.getRemarks(), MapLogisticPoint.class);
+        MapLogisticPoint mapLogisticPoint = JSONObject.parseObject(pushChatMessage.getRemarks(), MapLogisticPoint.class);
         iMapTaskService.confirmPresetPoint(mapLogisticPoint);
-        iPushMessageService.removeById(pushMessage.getId());
+        iPushChatMessageService.removeById(pushChatMessage.getId());
         return R.ok();
     }
 

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

@@ -11,12 +11,13 @@ import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.common.core.exception.CheckedException;
 import com.cloud.kicc.common.security.util.SecurityUtils;
-import com.cloud.kicc.commonbiz.api.entity.PushMessage;
 import com.cloud.kicc.commonbiz.api.entity.PushApplication;
-import com.cloud.kicc.commonbiz.api.entity.PushThirdParty;
+import com.cloud.kicc.commonbiz.api.entity.PushChatMessage;
+import com.cloud.kicc.commonbiz.api.entity.PushEnterprise;
 import com.cloud.kicc.commonbiz.service.IPushApplicationService;
-import com.cloud.kicc.commonbiz.service.IPushThirdPartyService;
+import com.cloud.kicc.commonbiz.service.IPushEnterpriseService;
 import com.cloud.kicc.system.api.entity.OauthClientDetails;
+import io.lettuce.core.api.push.PushMessage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -27,11 +28,11 @@ import java.util.Arrays;
 
 /**
  * <p>
- *  前端控制器
+ * 推送应用表 前端控制器
  * </p>
  *
  * @author wangxiang4
- * @since 2023-02-16`
+ * @since 2023-03-24
  */
 @RestController
 @RequestMapping(AppConstants.APP_COMMON + "/pushApplication")
@@ -40,7 +41,7 @@ import java.util.Arrays;
 public class PushApplicationController {
 
     private final IPushApplicationService iPushApplicationService;
-    private final IPushThirdPartyService iPushThirdPartyService;
+    private final IPushEnterpriseService iPushEnterpriseService;
 
     private LambdaQueryWrapper<PushApplication> getQueryWrapper(PushApplication pushApplication) {
         return new LambdaQueryWrapper<PushApplication>()
@@ -65,7 +66,7 @@ public class PushApplicationController {
     @PostMapping("/save")
     public R save(@Valid @RequestBody PushApplication pushApplication) {
         // 验证企业是否已经认证
-        if (iPushThirdPartyService.count(Wrappers.<PushThirdParty>lambdaQuery().eq(PushThirdParty::getUserId, SecurityUtils.getUser().getId())) == 0){
+        if (iPushEnterpriseService.count(Wrappers.<PushEnterprise>lambdaQuery().eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId())) == 0){
             throw new CheckedException("当前企业未认证，请认证后在操作！");
         }
         pushApplication.setMessageSecret(UUID.randomUUID().toString().replace("-",""));
@@ -76,7 +77,7 @@ public class PushApplicationController {
     @ApiOperation("修改")
     @PutMapping("/update")
     public R update(@Valid @RequestBody PushApplication pushApplication) {
-        if (iPushThirdPartyService.count(Wrappers.<PushThirdParty>lambdaQuery().eq(PushThirdParty::getUserId, SecurityUtils.getUser().getId())) == 0){
+        if (iPushEnterpriseService.count(Wrappers.<PushEnterprise>lambdaQuery().eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId())) == 0){
             throw new CheckedException("当前企业未认证，请认证后在操作！");
         }
         iPushApplicationService.updateById(pushApplication);
@@ -86,7 +87,7 @@ public class PushApplicationController {
     @ApiOperation("删除")
     @DeleteMapping("/remove/{ids:[\\w,]+}")
     public R<Boolean> removeById(@PathVariable String[] ids) {
-        if (iPushThirdPartyService.count(Wrappers.<PushThirdParty>lambdaQuery().eq(PushThirdParty::getUserId, SecurityUtils.getUser().getId())) == 0){
+        if (iPushEnterpriseService.count(Wrappers.<PushEnterprise>lambdaQuery().eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId())) == 0){
             throw new CheckedException("当前企业未认证，请认证后在操作！");
         }
         iPushApplicationService.removeByIds(Arrays.asList(ids));
@@ -95,8 +96,8 @@ public class PushApplicationController {
 
     @PostMapping("/send")
     @ApiOperation(value = "消息发送")
-    public R mapPresetPointConfirmPushMsgTest(@Valid @RequestBody PushMessage pushMessage) {
+    public R mapPresetPointConfirmPushMsgTest(@Valid @RequestBody PushChatMessage pushChatMessage) {
-        iPushApplicationService.messageSend(pushMessage);
+        iPushApplicationService.messageSend(pushChatMessage);
         return R.ok(true);
     }
 

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

@@ -0,0 +1,71 @@
+package com.cloud.kicc.commonbiz.controller;
+
+
+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.PushBlacklist;
+import com.cloud.kicc.commonbiz.service.IPushBlacklistService;
+import com.cloud.kicc.system.api.entity.User;
+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;
+import java.util.Map;
+
+/**
+ * <p>
+ * 黑名单表 前端控制器
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@RestController
+@RequestMapping(AppConstants.APP_COMMON + "/pushBlacklist")
+@RequiredArgsConstructor
+@Api(tags = "黑名单")
+public class PushBlacklistController {
+
+    private final IPushBlacklistService iPushBlacklistService;
+
+    @ApiOperation("分页查询")
+    @GetMapping("/list")
+    public R list(Page page, User user) {
+        IPage<Map<String, Object>> iPage = iPushBlacklistService.selectPushBlacklist(page, user);
+        return R.ok(iPage.getRecords(), iPage.getTotal());
+    }
+
+    @ApiOperation("根据黑名单ID查询")
+    @GetMapping("/getById")
+    public R getById(PushBlacklist pushBlacklist) {
+        return R.ok(iPushBlacklistService.getByPushBlacklistId(pushBlacklist));
+    }
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody PushBlacklist pushBlacklist) {
+        iPushBlacklistService.save(pushBlacklist);
+        return R.ok();
+    }
+
+    @ApiOperation("修改")
+    @PutMapping("/update")
+    public R update(@Valid @RequestBody PushBlacklist pushBlacklist) {
+        iPushBlacklistService.updateById(pushBlacklist);
+        return R.ok();
+    }
+
+    @ApiOperation("删除")
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    public R<Boolean> removeById(@PathVariable String[] ids) {
+        iPushBlacklistService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+}
+

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

@@ -0,0 +1,82 @@
+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.common.security.util.SecurityUtils;
+import com.cloud.kicc.commonbiz.api.entity.PushChatMessage;
+import com.cloud.kicc.commonbiz.service.IPushChatMessageService;
+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-03-24
+ */
+@RestController
+@RequestMapping(AppConstants.APP_COMMON + "/pushChatMessage")
+@RequiredArgsConstructor
+@Api("聊天记录")
+public class PushChatMessageController {
+
+    private final IPushChatMessageService iPushChatMessageService;
+
+    private LambdaQueryWrapper<PushChatMessage> getQueryWrapper(PushChatMessage pushChatMessage) {
+        return new LambdaQueryWrapper<PushChatMessage>()
+                .eq(StrUtil.isNotBlank(pushChatMessage.getStatus()), PushChatMessage::getStatus, pushChatMessage.getStatus())
+                .like(StrUtil.isNotBlank(pushChatMessage.getTitle()), PushChatMessage::getTitle, pushChatMessage.getTitle())
+                .eq(PushChatMessage::getUserId, pushChatMessage.getUserId())
+                .eq(StrUtil.isNotBlank(pushChatMessage.getPushUserId()), PushChatMessage::getPushUserId, pushChatMessage.getPushUserId());
+    }
+
+    @GetMapping("/list")
+    @ApiOperation(value = "分页查询")
+    public R list(Page page, PushChatMessage pushChatMessage) {
+        pushChatMessage.setUserId(SecurityUtils.getUser().getId());
+        IPage<PushChatMessage> result = iPushChatMessageService.page(page, getQueryWrapper(pushChatMessage));
+        return R.ok(result.getRecords(), result.getTotal());
+    }
+
+    @GetMapping("/{id:\\w+}")
+    @ApiOperation(value = "根据id获取")
+    public R getById(@PathVariable("id") String id) {
+        PushChatMessage pushChatMessage = iPushChatMessageService.getById(id);
+        return R.ok(pushChatMessage);
+    }
+
+    @PostMapping("/save")
+    @ApiOperation(value = "保存")
+    public R save(@Valid @RequestBody PushChatMessage pushChatMessage) {
+        iPushChatMessageService.save(pushChatMessage);
+        return R.ok();
+    }
+
+    @PutMapping("/update")
+    @ApiOperation(value = "修改")
+    public R update(@Valid @RequestBody PushChatMessage pushChatMessage) {
+        iPushChatMessageService.updateById(pushChatMessage);
+        return R.ok();
+    }
+
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    @ApiOperation(value = "删除")
+    public R remove(@PathVariable String[] ids) {
+        iPushChatMessageService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+}
+

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

@@ -0,0 +1,81 @@
+package com.cloud.kicc.commonbiz.controller;
+
+
+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.PushConcernFan;
+import com.cloud.kicc.commonbiz.service.IPushConcernFanService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * <p>
+ * 关注粉丝表 前端控制器
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping(AppConstants.APP_COMMON + "/pushConcernFan")
+@Api("关注粉丝管理")
+public class PushConcernFanController {
+
+    private final IPushConcernFanService iPushConcernFanService;
+
+    @ApiOperation("分页查询")
+    @GetMapping("/list")
+    public R list(Page page, @RequestParam Map map) {
+        IPage<Map<String, Object>> list = iPushConcernFanService.selectPushConcernFanList(page, map);
+        return R.ok(list.getRecords(), list.getTotal());
+    }
+
+    @ApiOperation("根据ID查询")
+    @GetMapping("/{id:\\w+}")
+    public R getById(@PathVariable("id") String id) {
+        return R.ok(iPushConcernFanService.getByPushConcernFanId(id));
+    }
+
+    @ApiOperation("粉丝审核")
+    @PostMapping("/audit/{ids:[\\w,]+}")
+    public R approved(@PathVariable String[] ids) {
+        iPushConcernFanService.update(Wrappers.<PushConcernFan>lambdaUpdate()
+                .set(PushConcernFan::getStatus, "1")
+                .in(PushConcernFan::getId, ids));
+        return R.ok();
+    }
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody PushConcernFan pushConcernFan) {
+        iPushConcernFanService.save(pushConcernFan);
+        return R.ok();
+    }
+
+    @ApiOperation("修改")
+    @PutMapping("/update")
+    public R update(@Valid @RequestBody PushConcernFan pushConcernFan) {
+        iPushConcernFanService.updateById(pushConcernFan);
+        return R.ok();
+    }
+
+    @ApiOperation("删除")
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    public R<Boolean> removeById(@PathVariable String[] ids) {
+        iPushConcernFanService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+}
+

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

@@ -0,0 +1,70 @@
+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.PushConcernFanType;
+import com.cloud.kicc.commonbiz.api.entity.PushType;
+import com.cloud.kicc.commonbiz.service.IPushConcernFanTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ * 推送关注粉丝跟类型关联表 前端控制器
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(AppConstants.APP_COMMON + "/pushConcernFanType")
+@Api("推送关注粉丝跟类型关联管理")
+public class PushConcernFanTypeController {
+
+    private final IPushConcernFanTypeService iPushConcernFanTypeService;
+
+    private LambdaQueryWrapper<PushConcernFanType> getQueryWrapper(PushConcernFanType pushConcernFanType) {
+        return new LambdaQueryWrapper<PushConcernFanType>()
+                .eq(PushConcernFanType::getUserId, pushConcernFanType.getUserId())
+                .eq(StrUtil.isNotBlank(pushConcernFanType.getName()), PushConcernFanType::getName, pushConcernFanType.getName());
+    }
+
+    @ApiOperation("分页查询")
+    @GetMapping("/list")
+    public R list(Page page, PushConcernFanType pushConcernFanType) {
+        IPage<PushType> list = iPushConcernFanTypeService.page(page, getQueryWrapper(pushConcernFanType));
+        return R.ok(list.getRecords(), list.getTotal());
+    }
+
+    @ApiOperation("根据ID查询")
+    @GetMapping("/{id:\\w+}")
+    public R getById(@PathVariable("id") String id) {
+        return R.ok(iPushConcernFanTypeService.getById(id));
+    }
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody PushConcernFanType pushConcernFanType) {
+        iPushConcernFanTypeService.save(pushConcernFanType);
+        return R.ok();
+    }
+
+    @ApiOperation("修改")
+    @PutMapping("/update")
+    public R update(@Valid @RequestBody PushConcernFanType pushConcernFanType) {
+        iPushConcernFanTypeService.updateById(pushConcernFanType);
+        return R.ok();
+    }
+
+}
+

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

@@ -0,0 +1,97 @@
+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.exception.CheckedException;
+import com.cloud.kicc.common.security.util.SecurityUtils;
+import com.cloud.kicc.commonbiz.api.entity.PushEnterprise;
+import com.cloud.kicc.commonbiz.service.IPushEnterpriseService;
+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-03-24
+ */
+@RestController
+@RequestMapping("/pushEnterprise")
+@RequiredArgsConstructor
+@Api("第三方企业资料管理")
+public class PushEnterpriseController {
+
+    private final IPushEnterpriseService iPushEnterpriseService;
+
+    private LambdaQueryWrapper<PushEnterprise> getQueryWrapper(PushEnterprise pushEnterprise) {
+        return new LambdaQueryWrapper<PushEnterprise>()
+                .eq(StrUtil.isNotBlank(pushEnterprise.getName()), PushEnterprise::getName, pushEnterprise.getName())
+                .eq(StrUtil.isNotBlank(pushEnterprise.getStatus()), PushEnterprise::getStatus, pushEnterprise.getStatus());
+    }
+
+    @ApiOperation("分页查询")
+    @GetMapping("/list")
+    public R list(Page page, PushEnterprise pushEnterprise) {
+        IPage<PushEnterprise> list = iPushEnterpriseService.page(page, getQueryWrapper(pushEnterprise));
+        return R.ok(list.getRecords(), list.getTotal());
+    }
+
+    @ApiOperation("根据ID查询")
+    @GetMapping("/{id:\\w+}")
+    public R getById(@PathVariable("id") String id) {
+        return R.ok(iPushEnterpriseService.getById(id));
+    }
+
+    @ApiOperation("根据用户ID查询")
+    @GetMapping("/getByUserId/{userId:\\w+}")
+    public R getByUserId(@PathVariable String userId) {
+        return R.ok(iPushEnterpriseService.getOne(Wrappers.<PushEnterprise>lambdaQuery().eq(PushEnterprise::getUserId, userId)));
+    }
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody PushEnterprise pushEnterprise) {
+        if(iPushEnterpriseService.count(Wrappers.<PushEnterprise>lambdaQuery()
+                .eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId())) > 0) {
+            throw new CheckedException("当前已经存在认证申请不能重复申请！");
+        }
+        if (StrUtil.isBlank(pushEnterprise.getUserId())) pushEnterprise.setUserId(SecurityUtils.getUser().getId());
+        iPushEnterpriseService.save(pushEnterprise);
+        return R.ok();
+    }
+
+    @ApiOperation("修改")
+    @PutMapping("/update")
+    public R update(@Valid @RequestBody PushEnterprise pushEnterprise) {
+        iPushEnterpriseService.updateById(pushEnterprise);
+        return R.ok();
+    }
+
+    @ApiOperation("删除")
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    public R<Boolean> removeById(@PathVariable String[] ids) {
+        iPushEnterpriseService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+    @ApiOperation("撤销申请")
+    @DeleteMapping("/revokeAuth")
+    public R<Boolean> revokeAuth() {
+        iPushEnterpriseService.remove(Wrappers.<PushEnterprise>lambdaQuery().eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId()));
+        return R.ok();
+    }
+
+}
+

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

@@ -1,63 +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.PushFile;
-import com.cloud.kicc.commonbiz.service.IPushFileService;
-import io.swagger.annotations.Api;
-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
-@Api(tags = "推送文件")
-public class PushFileController {
-
-    private final IPushFileService iPushFileService;
-
-    private LambdaQueryWrapper<PushFile> getQueryWrapper(PushFile pushFile) {
-        return new LambdaQueryWrapper<PushFile>()
-                .eq(StrUtil.isNotBlank(pushFile.getCreateById()), PushFile::getCreateById, pushFile.getCreateById())
-                .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

@@ -1,78 +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.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.getFromUserId()), PushMessage::getFromUserId, pushMessage.getFromUserId())
-                .like(StrUtil.isNotBlank(pushMessage.getAlias()), PushMessage::getAlias, pushMessage.getAlias())
-                .like(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

@@ -1,78 +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.PushPassList;
-import com.cloud.kicc.commonbiz.service.IPushPassListService;
-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 + "/pushPassList")
-@RequiredArgsConstructor
-@Api(tags = "推送黑名单白名单列表")
-public class PushPassListController {
-
-    private final IPushPassListService iPushPassListService;
-
-    private LambdaQueryWrapper<PushPassList> getQueryWrapper(PushPassList pushBlacklist) {
-        return new LambdaQueryWrapper<PushPassList>()
-                .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());
-    }
-
-    @ApiOperation("分页查询")
-    @GetMapping("/list")
-    public R list(Page page, PushPassList pushPassList) {
-        IPage<PushPassList> list = iPushPassListService.page(page, getQueryWrapper(pushPassList));
-        return R.ok(list.getRecords(), list.getTotal());
-    }
-
-    @ApiOperation("根据ID查询")
-    @GetMapping("/{id:\\w+}")
-    public R getById(@PathVariable("id") String id) {
-        return R.ok(iPushPassListService.getById(id));
-    }
-
-    @ApiOperation("保存")
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody PushPassList pushPassList) {
-        iPushPassListService.save(pushPassList);
-        return R.ok();
-    }
-
-    @ApiOperation("修改")
-    @PutMapping("/update")
-    public R update(@Valid @RequestBody PushPassList pushPassList) {
-        iPushPassListService.updateById(pushPassList);
-        return R.ok();
-    }
-
-    @ApiOperation("删除")
-    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    public R<Boolean> removeById(@PathVariable String[] ids) {
-        iPushPassListService.removeByIds(Arrays.asList(ids));
-        return R.ok();
-    }
-
-}
-

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushRingtoneController.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.PushRingtone;
+import com.cloud.kicc.commonbiz.api.entity.PushType;
+import com.cloud.kicc.commonbiz.service.IPushRingtoneService;
+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-03-24
+ */
+@RestController
+@RequestMapping(AppConstants.APP_COMMON + "/pushRingtone")
+@RequiredArgsConstructor
+@Api("在线铃声管理")
+public class PushRingtoneController {
+
+    private final IPushRingtoneService iPushRingtoneService;
+
+    private LambdaQueryWrapper<PushRingtone> getQueryWrapper(PushRingtone pushRingtone) {
+        return new LambdaQueryWrapper<PushRingtone>()
+                .eq(PushRingtone::getCreateById, pushRingtone.getCreateById())
+                .eq(StrUtil.isNotBlank(pushRingtone.getName()), PushRingtone::getName, pushRingtone.getName());
+    }
+
+    @ApiOperation("分页查询")
+    @GetMapping("/list")
+    public R list(Page page, PushRingtone pushRingtone) {
+        IPage<PushType> list = iPushRingtoneService.page(page, getQueryWrapper(pushRingtone));
+        return R.ok(list.getRecords(), list.getTotal());
+    }
+
+    @ApiOperation("根据ID查询")
+    @GetMapping("/{id:\\w+}")
+    public R getById(@PathVariable("id") String id) {
+        return R.ok(iPushRingtoneService.getById(id));
+    }
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody PushRingtone pushRingtone) {
+        iPushRingtoneService.save(pushRingtone);
+        return R.ok();
+    }
+
+    @ApiOperation("修改")
+    @PutMapping("/update")
+    public R update(@Valid @RequestBody PushRingtone pushRingtone) {
+        iPushRingtoneService.updateById(pushRingtone);
+        return R.ok();
+    }
+
+    @ApiOperation("删除")
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    public R<Boolean> removeById(@PathVariable String[] ids) {
+        iPushRingtoneService.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

@@ -1,101 +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.conditions.update.UpdateWrapper;
-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.common.core.exception.CheckedException;
-import com.cloud.kicc.common.security.util.SecurityUtils;
-import com.cloud.kicc.commonbiz.api.entity.PushThirdParty;
-import com.cloud.kicc.commonbiz.service.IPushThirdPartyService;
-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 + "/pushThirdParty")
-@RequiredArgsConstructor
-@Api(tags = "第三方认证")
-public class PushThirdPartyController {
-
-    private final IPushThirdPartyService iPushThirdPartyService;
-
-    private LambdaQueryWrapper<PushThirdParty> getQueryWrapper(PushThirdParty pushThirdParty) {
-        return new LambdaQueryWrapper<PushThirdParty>()
-                .eq(StrUtil.isNotBlank(pushThirdParty.getEntName()), PushThirdParty::getEntName, pushThirdParty.getEntName())
-                .eq(StrUtil.isNotBlank(pushThirdParty.getStatus()), PushThirdParty::getStatus, pushThirdParty.getStatus());
-    }
-
-    @ApiOperation("分页查询")
-    @GetMapping("/list")
-    public R list(Page page, PushThirdParty pushThirdParty) {
-        IPage<PushThirdParty> list = iPushThirdPartyService.page(page, getQueryWrapper(pushThirdParty));
-        return R.ok(list.getRecords(), list.getTotal());
-    }
-
-    @ApiOperation("根据ID查询")
-    @GetMapping("/{id:\\w+}")
-    public R getById(@PathVariable("id") String id) {
-        return R.ok(iPushThirdPartyService.getById(id));
-    }
-
-    @ApiOperation("根据用户ID查询")
-    @GetMapping("/getByUserId/{id:\\w+}")
-    public R getByUserId(@PathVariable("id") String id) {
-        return R.ok(iPushThirdPartyService.getOne(Wrappers.<PushThirdParty>lambdaQuery().eq(PushThirdParty::getUserId, id)));
-    }
-
-    @ApiOperation("保存")
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody PushThirdParty pushThirdParty) {
-        if(iPushThirdPartyService.count(Wrappers.<PushThirdParty>lambdaQuery()
-                .eq(PushThirdParty::getUserId, SecurityUtils.getUser().getId())) > 0) {
-            throw new CheckedException("当前已经存在认证申请不能重复申请！");
-        }
-        if (StrUtil.isBlank(pushThirdParty.getUserId()))
-            pushThirdParty.setUserId(SecurityUtils.getUser().getId());
-        iPushThirdPartyService.save(pushThirdParty);
-        return R.ok();
-    }
-
-    @ApiOperation("修改")
-    @PutMapping("/update")
-    public R update(@Valid @RequestBody PushThirdParty pushThirdParty) {
-        iPushThirdPartyService.updateById(pushThirdParty);
-        return R.ok();
-    }
-
-    @ApiOperation("删除")
-    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    public R<Boolean> removeById(@PathVariable String[] ids) {
-        iPushThirdPartyService.removeByIds(Arrays.asList(ids));
-        return R.ok();
-    }
-
-    @ApiOperation("撤销申请")
-    @DeleteMapping("/revokeAuth")
-    public R<Boolean> revokeAuth() {
-        iPushThirdPartyService.remove(Wrappers.<PushThirdParty>lambdaQuery()
-                .eq(PushThirdParty::getUserId, SecurityUtils.getUser().getId()));
-        return R.ok();
-    }
-
-}
-

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

@@ -8,8 +8,8 @@ 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.security.util.SecurityUtils;
-import com.cloud.kicc.commonbiz.api.entity.PushCustomType;
+import com.cloud.kicc.commonbiz.api.entity.PushType;
-import com.cloud.kicc.commonbiz.service.IPushCustomTypeService;
+import com.cloud.kicc.commonbiz.service.IPushTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -20,59 +20,61 @@ import java.util.Arrays;
 
 /**
  * <p>
- *  前端控制器
+ * 推送类型 前端控制器
  * </p>
  *
  * @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
  */
 @RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushCustomType")
+@RequestMapping(AppConstants.APP_COMMON + "/pushType")
 @RequiredArgsConstructor
-@Api(tags = "推送自定义通知类型")
+@Api("推送类型管理")
-public class PushCustomTypeController {
+public class PushTypeController {
 
-    private final IPushCustomTypeService iPushCustomTypeService;
+    private final IPushTypeService iPushTypeService;
 
-    private LambdaQueryWrapper<PushCustomType> getQueryWrapper(PushCustomType pushCustomType) {
+    private LambdaQueryWrapper<PushType> getQueryWrapper(PushType pushType) {
-        return new LambdaQueryWrapper<PushCustomType>()
+        return new LambdaQueryWrapper<PushType>()
-                .eq(PushCustomType::getCreateById, SecurityUtils.getUser().getId())
+                .eq(PushType::getCreateById, pushType.getCreateById())
-                .eq(StrUtil.isNotBlank(pushCustomType.getName()), PushCustomType::getName, pushCustomType.getName());
+                .eq(StrUtil.isNotBlank(pushType.getName()), PushType::getName, pushType.getName());
     }
 
     @ApiOperation("分页查询")
     @GetMapping("/list")
-    public R list(Page page, PushCustomType pushCustomType) {
+    public R list(Page page, PushType pushType) {
-        IPage<PushCustomType> list = iPushCustomTypeService.page(page, getQueryWrapper(pushCustomType));
+        pushType.setCreateById(SecurityUtils.getUser().getId());
+        IPage<PushType> list = iPushTypeService.page(page, getQueryWrapper(pushType));
         return R.ok(list.getRecords(), list.getTotal());
     }
 
     @ApiOperation("根据ID查询")
     @GetMapping("/{id:\\w+}")
     public R getById(@PathVariable("id") String id) {
-        return R.ok(iPushCustomTypeService.getById(id));
+        return R.ok(iPushTypeService.getById(id));
     }
 
     @ApiOperation("保存")
     @PostMapping("/save")
-    public R save(@Valid @RequestBody PushCustomType pushCustomType) {
+    public R save(@Valid @RequestBody PushType pushType) {
-        iPushCustomTypeService.save(pushCustomType);
+        iPushTypeService.save(pushType);
         return R.ok();
     }
 
     @ApiOperation("修改")
     @PutMapping("/update")
-    public R update(@Valid @RequestBody PushCustomType pushCustomType) {
+    public R update(@Valid @RequestBody PushType pushType) {
-        iPushCustomTypeService.updateById(pushCustomType);
+        iPushTypeService.updateById(pushType);
         return R.ok();
     }
 
     @ApiOperation("删除")
     @DeleteMapping("/remove/{ids:[\\w,]+}")
     public R<Boolean> removeById(@PathVariable String[] ids) {
-        iPushCustomTypeService.removeByIds(Arrays.asList(ids));
+        iPushTypeService.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

@@ -1,90 +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.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.PushUserManage;
-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 javax.validation.Valid;
-import java.util.Arrays;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushUserManage")
-@RequiredArgsConstructor
-@Api(tags = "第三方用户推送管理")
-public class PushUserManageController {
-
-    private final IPushUserManageService iPushUserManageService;
-
-    private LambdaQueryWrapper<PushUserManage> getQueryWrapper(PushUserManage pushUserManage) {
-        return new LambdaQueryWrapper<PushUserManage>()
-                .eq(StrUtil.isNotBlank(pushUserManage.getStatus()), PushUserManage::getStatus, pushUserManage.getStatus())
-                .eq(StrUtil.isNotBlank(pushUserManage.getType()), PushUserManage::getType, pushUserManage.getType())
-                .eq(StrUtil.isNotBlank(pushUserManage.getFromUserId()), PushUserManage::getFromUserId, pushUserManage.getFromUserId())
-                .eq(StrUtil.isNotBlank(pushUserManage.getToUserId()), PushUserManage::getToUserId, pushUserManage.getToUserId())
-                .like(StrUtil.isNotBlank(pushUserManage.getUserName()), PushUserManage::getUserName, pushUserManage.getUserName());
-    }
-
-    @ApiOperation("分页查询")
-    @GetMapping("/list")
-    public R list(Page page, PushUserManage pushUserManage) {
-        IPage<PushUserManage> list = iPushUserManageService.page(page, getQueryWrapper(pushUserManage));
-        return R.ok(list.getRecords(), list.getTotal());
-    }
-
-    @ApiOperation("根据ID查询")
-    @GetMapping("/{id:\\w+}")
-    public R getById(@PathVariable("id") String id) {
-        return R.ok(iPushUserManageService.getById(id));
-    }
-
-    @ApiOperation("保存")
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody PushUserManage pushUserManage) {
-        iPushUserManageService.save(pushUserManage);
-        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) {
-        iPushUserManageService.updateById(pushUserManage);
-        return R.ok();
-    }
-
-    @ApiOperation("删除")
-    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    public R<Boolean> removeById(@PathVariable String[] ids) {
-        iPushUserManageService.removeByIds(Arrays.asList(ids));
-        return R.ok();
-    }
-
-}
-

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

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- *  Mapper 接口
+ * 推送应用表 Mapper 接口
  * </p>
  *
  * @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
  */
 public interface PushApplicationMapper extends BaseMapper<PushApplication> {
 

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

@@ -0,0 +1,29 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cloud.kicc.commonbiz.api.entity.PushBlacklist;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cloud.kicc.system.api.entity.User;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 黑名单表 Mapper 接口
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushBlacklistMapper extends BaseMapper<PushBlacklist> {
+
+    @MapKey("concernUserId")
+    IPage<Map<String, Object>> selectPushBlacklist(@Param("page") IPage<Map<String, Object>> page, @Param("user") User user);
+
+    @MapKey("concernUserId")
+    Map<String, Object> getByPushBlacklistId(PushBlacklist pushBlacklist);
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.cloud.kicc.commonbiz.api.entity.PushChatMessage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 聊天消息表 Mapper 接口
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushChatMessageMapper extends BaseMapper<PushChatMessage> {
+
+}

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

@@ -0,0 +1,29 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cloud.kicc.commonbiz.api.entity.PushBlacklist;
+import com.cloud.kicc.commonbiz.api.entity.PushConcernFan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cloud.kicc.system.api.entity.User;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 关注粉丝表 Mapper 接口
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushConcernFanMapper extends BaseMapper<PushConcernFan> {
+
+    @MapKey("id")
+    IPage<Map<String, Object>> selectPushConcernFanList(@Param("page") IPage<Map<String, Object>> page, @Param("map") Map map);
+
+    @MapKey("id")
+    Map<String, Object> getByPushConcernFanId(String id);
+
+}

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.cloud.kicc.commonbiz.api.entity.PushConcernFanType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 推送关注粉丝跟类型关联表 Mapper 接口
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushConcernFanTypeMapper extends BaseMapper<PushConcernFanType> {
+
+}

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

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

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.cloud.kicc.commonbiz.api.entity.PushEnterprise;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 第三方企业资料表 Mapper 接口
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushEnterpriseMapper extends BaseMapper<PushEnterprise> {
+
+}

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

@@ -1,16 +0,0 @@
-package com.cloud.kicc.commonbiz.mapper;
-
-import com.cloud.kicc.commonbiz.api.entity.PushFile;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-26
- */
-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,16 +0,0 @@
-package com.cloud.kicc.commonbiz.mapper;
-
-import com.cloud.kicc.commonbiz.api.entity.PushMessage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author entfrm开发团队-王翔
- * @since 2022-11-15
- */
-public interface PushMessageMapper extends BaseMapper<PushMessage> {
-
-}

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

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

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.cloud.kicc.commonbiz.api.entity.PushRingtone;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 在线铃声表 Mapper 接口
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushRingtoneMapper extends BaseMapper<PushRingtone> {
+
+}

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

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

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.cloud.kicc.commonbiz.api.entity.PushType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 推送类型 Mapper 接口
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushTypeMapper extends BaseMapper<PushType> {
+
+}

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

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

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

@@ -1,16 +1,18 @@
 package com.cloud.kicc.commonbiz.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.cloud.kicc.commonbiz.api.entity.PushMessage;
 import com.cloud.kicc.commonbiz.api.entity.PushApplication;
+import com.cloud.kicc.commonbiz.api.entity.PushChatMessage;
+import com.cloud.kicc.commonbiz.api.entity.PushEnterprise;
+import io.lettuce.core.api.push.PushMessage;
 
 /**
  * <p>
- *  服务类
+ * 推送应用表 服务类
  * </p>
  *
  * @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
  */
 public interface IPushApplicationService extends IService<PushApplication> {
 
@@ -19,6 +21,6 @@ public interface IPushApplicationService extends IService<PushApplication> {
      * @param
      * @return
      */
-    void messageSend(PushMessage pushMessage);
+    void messageSend(PushChatMessage pushChatMessage);
 
 }

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

@@ -0,0 +1,34 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cloud.kicc.commonbiz.api.entity.PushBlacklist;
+import com.cloud.kicc.system.api.entity.User;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 黑名单表 服务类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushBlacklistService extends IService<PushBlacklist> {
+
+    /**
+     * 查询黑名单列表
+     * @param
+     * @return
+     */
+    IPage<Map<String, Object>> selectPushBlacklist(IPage<Map<String, Object>> page, User user);
+
+    /**
+     * 根据推送黑名单ID查询
+     * @param
+     * @return
+     */
+    Map<String, Object> getByPushBlacklistId(PushBlacklist pushBlacklist);
+
+}

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.cloud.kicc.commonbiz.api.entity.PushChatMessage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 聊天消息表 服务类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushChatMessageService extends IService<PushChatMessage> {
+
+}

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

@@ -0,0 +1,33 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cloud.kicc.commonbiz.api.entity.PushConcernFan;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 关注粉丝表 服务类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushConcernFanService extends IService<PushConcernFan> {
+
+    /**
+     * 查询列表
+     * @param
+     * @return
+     */
+    IPage<Map<String, Object>> selectPushConcernFanList(IPage<Map<String, Object>> page, Map<String, Object> map);
+
+    /**
+     * 根据ID查询
+     * @param
+     * @return
+     */
+    Map<String, Object> getByPushConcernFanId(String id);
+
+}

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.cloud.kicc.commonbiz.api.entity.PushConcernFanType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 推送关注粉丝跟类型关联表 服务类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushConcernFanTypeService extends IService<PushConcernFanType> {
+
+}

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

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

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.cloud.kicc.commonbiz.api.entity.PushEnterprise;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 第三方企业资料表 服务类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushEnterpriseService extends IService<PushEnterprise> {
+
+}

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

@@ -1,34 +0,0 @@
-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>
- *  服务类  todo: 需要移除
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-26
- */
-@Deprecated
-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,16 +0,0 @@
-package com.cloud.kicc.commonbiz.service;
-
-import com.cloud.kicc.commonbiz.api.entity.PushMessage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author entfrm开发团队-王翔
- * @since 2022-11-15
- */
-public interface IPushMessageService extends IService<PushMessage> {
-
-}

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

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

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.cloud.kicc.commonbiz.api.entity.PushRingtone;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 在线铃声表 服务类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushRingtoneService extends IService<PushRingtone> {
+
+}

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

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

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.cloud.kicc.commonbiz.api.entity.PushType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 推送类型 服务类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushTypeService extends IService<PushType> {
+
+}

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

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

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

@@ -1,5 +1,6 @@
 package com.cloud.kicc.commonbiz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -17,6 +18,7 @@ import com.cloud.kicc.commonbiz.service.*;
 import com.cloud.kicc.commonbiz.util.PushClientUtil;
 import com.cloud.kicc.system.api.entity.User;
 import com.cloud.kicc.system.api.feign.RemoteUserService;
+import io.lettuce.core.api.push.PushMessage;
 import lombok.RequiredArgsConstructor;
 import okhttp3.OkHttpClient;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -34,11 +36,11 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
- *  服务实现类
+ * 推送应用表 服务实现类
  * </p>
  *
  * @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
  */
 @Service
 @RequiredArgsConstructor
@@ -46,52 +48,52 @@ import java.util.stream.Collectors;
 public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMapper, PushApplication> implements IPushApplicationService {
 
     private final OkHttpClient okHttpClient;
-    private final IPushUserManageService iPushUserManageService;
+    //private final IPushUserManageService iPushUserManageService;
-    private final IPushMessageService iPushMessageService;
+    //private final IPushMessageService iPushMessageService;
     private final RemoteUserService remoteUserService;
-    private final IPushCustomTypeService iPushCustomTypeService;
+    //private final IPushCustomTypeService iPushCustomTypeService;
-    private final IPushPassListService iPushPassListService;
+
     @Override
-    public void messageSend(PushMessage pushMessage) {
+    public void messageSend(PushChatMessage pushChatMessage) {
 
-        if (StrUtil.isBlank(pushMessage.getFromUserId()) || StrUtil.isBlank(pushMessage.getMessageSecret())) {
+        if (StrUtil.isBlank(pushChatMessage.getPushUserId()) || StrUtil.isBlank(pushChatMessage.getMessageSecret())) {
             throw new CheckedException("当前发送方用户ID与推送应用密钥必填!");
         }
-        R<User> result = remoteUserService.selectByUserId(pushMessage.getFromUserId(), SecurityConstants.FROM_IN);
+        R<User> result = remoteUserService.selectByUserId(pushChatMessage.getPushTypeId(), SecurityConstants.FROM_IN);
         if (result == null || result.getData() == null) {
             throw new CheckedException("用户不存在");
         }
         // 第三方发送前较验数据
         if (result.getData().getUserType().equals("9")) {
             PushApplication pushApplication = baseMapper.selectOne(Wrappers.<PushApplication>lambdaQuery()
-                    .eq(PushApplication::getMessageSecret, pushMessage.getMessageSecret()).eq(PushApplication::getStatus, "0"));
+                    .eq(PushApplication::getMessageSecret, pushChatMessage.getMessageSecret()).eq(PushApplication::getStatus, "0"));
             pushApplication = Optional.of(pushApplication).orElseThrow(() -> new CheckedException("你当前没有权限发送消息，请联系管理员!"));
             HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
             // 如果ip地址存在即验证发送方ip
-            if (StrUtil.isNotBlank(pushApplication.getIp()) && !StrUtil.contains(pushApplication.getIp(), ServletUtil.getClientIP(request))) {
+            if (StrUtil.isNotBlank(pushApplication.getIgnoreIp()) && !StrUtil.contains(pushApplication.getIgnoreIp(), ServletUtil.getClientIP(request))) {
                 throw new CheckedException("你的ip地址不正确，请检查消息应用中设置的ip地址!");
             }
         }
 
         // 查询当前用户设置的自定义快捷方式消息提醒属性
-        PushCustomType pushCustomType = iPushCustomTypeService.getOne(Wrappers.<PushCustomType>lambdaQuery()
+        /*PushCustomType pushCustomType = iPushCustomTypeService.getOne(Wrappers.<PushCustomType>lambdaQuery()
-                .eq(PushCustomType::getId, pushMessage.getCustomTypeId()).eq(PushCustomType::getCreateById, pushMessage.getFromUserId()));
+                .eq(PushCustomType::getId, pushChatMessage.getPushTypeId()).eq(PushCustomType::getCreateById, pushChatMessage.getFromUserId()));
         if (ObjectUtil.isNotEmpty(pushCustomType)) {
             pushMessage.setPlaySound(pushCustomType.getPlaySound());
             pushMessage.setPlayVibrate(pushCustomType.getPlayVibrate());
             pushMessage.setPlayLights(pushCustomType.getPlayLights());
             if (StrUtil.isNotBlank(pushCustomType.getCustomPlayFileName())) pushMessage.setCustomPlayFileName(pushCustomType.getCustomPlayFileName());
-        }
+        }*/
 
-        List<String> blacklist = iPushPassListService.list(Wrappers.<PushPassList>lambdaQuery()
+        List<String> blacklist = CollectionUtil.newArrayList(); /*iPushPassListService.list(Wrappers.<PushPassList>lambdaQuery()
                 .eq(PushPassList::getFromPushId, pushMessage.getFromUserId()).eq(PushPassList::getType, "0"))
-                .stream().map(item -> item.getToPushId()).collect(Collectors.toList());
+                .stream().map(item -> item.getToPushId()).collect(Collectors.toList());*/
 
-        List<String> whitelist = iPushPassListService.list(Wrappers.<PushPassList>lambdaQuery()
+        List<String> whitelist = CollectionUtil.newArrayList(); /*iPushPassListService.list(Wrappers.<PushPassList>lambdaQuery()
                 .eq(PushPassList::getFromPushId, pushMessage.getFromUserId()).eq(PushPassList::getType, "1"))
-                .stream().map(item -> item.getToPushId()).collect(Collectors.toList());
+                .stream().map(item -> item.getToPushId()).collect(Collectors.toList());*/
 
-        List<PushUserManage> pushList = iPushUserManageService.list(Wrappers.<PushUserManage>lambdaQuery()
+        /*List<PushUserManage> pushList = iPushUserManageService.list(Wrappers.<PushUserManage>lambdaQuery()
                 .eq(PushUserManage::getFromUserId, pushMessage.getFromUserId()).eq(PushUserManage::getStatus, "1"))
                 .stream().filter(item -> !blacklist.contains(item.getToUserId()) || !whitelist.contains(item.getToUserId())).collect(Collectors.toList());
 
@@ -102,12 +104,12 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
             pushMessage.setPlayVibrate("0");
             pushMessage.setPlayLights("0");
             send(pushMessage, item, pushMessage.getPlaySound(), pushMessage.getPlayVibrate(), pushMessage.getPlayLights());
-        });
+        });*/
     }
 
 
     private void send(PushMessage pushMessage, String toUserId, String playSound,  String playVibrate, String playLights) {
-        // 设置默认数据
+        /*// 设置默认数据
         pushMessage.setType("customizedcast");
         pushMessage.setDisplayType("notification");
         pushMessage.setAliasType(PushClientUtil.uPushUserAliasType);
@@ -149,7 +151,7 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
             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/PushBlacklistServiceImpl.java

@@ -0,0 +1,34 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cloud.kicc.commonbiz.api.entity.PushBlacklist;
+import com.cloud.kicc.commonbiz.mapper.PushBlacklistMapper;
+import com.cloud.kicc.commonbiz.service.IPushBlacklistService;
+import com.cloud.kicc.system.api.entity.User;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 黑名单表 服务实现类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushBlacklistServiceImpl extends ServiceImpl<PushBlacklistMapper, PushBlacklist> implements IPushBlacklistService {
+
+    @Override
+    public IPage<Map<String, Object>> selectPushBlacklist(IPage<Map<String, Object>> page, User user) {
+        return baseMapper.selectPushBlacklist(page, user);
+    }
+
+    @Override
+    public Map<String, Object> getByPushBlacklistId(PushBlacklist pushBlacklist) {
+        return baseMapper.getByPushBlacklistId(pushBlacklist);
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.cloud.kicc.commonbiz.api.entity.PushChatMessage;
+import com.cloud.kicc.commonbiz.mapper.PushChatMessageMapper;
+import com.cloud.kicc.commonbiz.service.IPushChatMessageService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 聊天消息表 服务实现类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushChatMessageServiceImpl extends ServiceImpl<PushChatMessageMapper, PushChatMessage> implements IPushChatMessageService {
+
+}

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

@@ -0,0 +1,32 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cloud.kicc.commonbiz.api.entity.PushConcernFan;
+import com.cloud.kicc.commonbiz.mapper.PushConcernFanMapper;
+import com.cloud.kicc.commonbiz.service.IPushConcernFanService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 关注粉丝表 服务实现类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper, PushConcernFan> implements IPushConcernFanService {
+
+    @Override
+    public IPage<Map<String, Object>> selectPushConcernFanList(IPage<Map<String, Object>> page, Map<String, Object> map) {
+        return baseMapper.selectPushConcernFanList(page, map);
+    }
+
+    @Override
+    public Map<String, Object> getByPushConcernFanId(String id) {
+        return baseMapper.getByPushConcernFanId(id);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.cloud.kicc.commonbiz.api.entity.PushConcernFanType;
+import com.cloud.kicc.commonbiz.mapper.PushConcernFanTypeMapper;
+import com.cloud.kicc.commonbiz.service.IPushConcernFanTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 推送关注粉丝跟类型关联表 服务实现类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushConcernFanTypeServiceImpl extends ServiceImpl<PushConcernFanTypeMapper, PushConcernFanType> implements IPushConcernFanTypeService {
+
+}

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

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

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

@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.cloud.kicc.commonbiz.api.entity.PushEnterprise;
+import com.cloud.kicc.commonbiz.mapper.PushEnterpriseMapper;
+import com.cloud.kicc.commonbiz.service.IPushEnterpriseService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 第三方企业资料表 服务实现类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushEnterpriseServiceImpl extends ServiceImpl<PushEnterpriseMapper, PushEnterprise> implements IPushEnterpriseService {
+
+}

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

@@ -1,73 +0,0 @@
-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>
- *  服务实现类 todo: 需要移除
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-26
- */
-@Deprecated
-@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

@@ -1,20 +0,0 @@
-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/PushPassListServiceImpl.java

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

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

@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.cloud.kicc.commonbiz.api.entity.PushRingtone;
+import com.cloud.kicc.commonbiz.mapper.PushRingtoneMapper;
+import com.cloud.kicc.commonbiz.service.IPushRingtoneService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 在线铃声表 服务实现类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushRingtoneServiceImpl extends ServiceImpl<PushRingtoneMapper, PushRingtone> implements IPushRingtoneService {
+
+}

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

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

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

@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.cloud.kicc.commonbiz.api.entity.PushType;
+import com.cloud.kicc.commonbiz.mapper.PushTypeMapper;
+import com.cloud.kicc.commonbiz.service.IPushTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 推送类型 服务实现类
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushTypeServiceImpl extends ServiceImpl<PushTypeMapper, PushType> implements IPushTypeService {
+
+}

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

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

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

@@ -0,0 +1,73 @@
+<?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.PushBlacklistMapper">
+
+  <select id="selectPushBlacklist" resultType="Map">
+    SELECT
+    bl.concern_user_id,
+    bl.fan_user_id,
+    u.user_name,
+    u.nick_name,
+    u.user_type,
+    u.dept_id,
+    u.dept_name,
+    u.email,
+    u.phone,
+    u.sex,
+    u.avatar,
+    u.`status`,
+    u.login_ip,
+    u.login_time,
+    u.create_by_id,
+    u.create_by_name,
+    u.create_time,
+    u.update_by_id,
+    u.update_by_name,
+    u.update_time,
+    u.remarks
+    FROM
+    common_push_blacklist bl JOIN sys_user u
+    ON
+    bl.fan_user_id = u.id
+    <where>
+      u.del_flag = 0 AND u.status = 0 AND bl.concern_user_id = #{user.createById}
+      <if test="user.nickName != null and user.nickName != ''">
+        AND u.nick_name = #{user.nickName}
+      </if>
+    </where>
+  </select>
+
+  <select id="getByPushBlacklistId" resultType="Map">
+    SELECT
+    bl.concern_user_id,
+    bl.fan_user_id,
+    u.user_name,
+    u.nick_name,
+    u.user_type,
+    u.dept_id,
+    u.dept_name,
+    u.email,
+    u.phone,
+    u.sex,
+    u.avatar,
+    u.`status`,
+    u.login_ip,
+    u.login_time,
+    u.create_by_id,
+    u.create_by_name,
+    u.create_time,
+    u.update_by_id,
+    u.update_by_name,
+    u.update_time,
+    u.remarks
+    FROM
+    common_push_blacklist bl JOIN sys_user u
+    ON
+    bl.fan_user_id = u.id
+    <where>
+      u.del_flag = 0 AND u.status = 0
+      bl.concern_user_id = #{concernUserId} AND bl.fan_user_id = #{fanUserId}
+    </where>
+  </select>
+
+</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushChatMessageMapper.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.PushCustomTypeMapper">
+<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushChatMessageMapper">
 
 </mapper>

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

@@ -0,0 +1,89 @@
+<?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.PushConcernFanMapper">
+
+  <select id="selectPushConcernFanList" resultType="Map">
+    SELECT
+    cf.id,
+    cf.concern_user_id,
+    cf.fan_user_id,
+    cf.`status`,
+    cf.create_time fan_create_time,
+    cf.remarks fan_remarks,
+    u.user_name,
+    u.nick_name,
+    u.user_type,
+    u.dept_id,
+    u.dept_name,
+    u.email,
+    u.phone,
+    u.sex,
+    u.avatar,
+    u.login_ip,
+    u.login_time,
+    u.create_by_id,
+    u.create_by_name,
+    u.create_time,
+    u.update_by_id,
+    u.update_by_name,
+    u.update_time,
+    u.remarks
+    FROM
+    common_push_concern_fan cf JOIN sys_user u
+    ON
+    cf.fan_user_id = u.id
+    <where>
+      cf.del_flag = 0 and u.status = 0
+      <if test="map.status != null and map.status != ''">
+        AND  cf.status = #{map.status}
+      </if>
+      <if test="map.concernUserId != null and map.concernUserId != ''">
+        AND  cf.concern_user_id = #{map.concernUserId}
+      </if>
+      <if test="map.fanUserId != null and map.fanUserId != ''">
+        AND  cf.fan_user_id = #{map.fanUserId}
+      </if>
+      <if test="map.nickName != null and map.nickName != ''">
+        AND u.nick_name = #{map.nickName}
+      </if>
+    </where>
+  </select>
+
+  <select id="getByPushConcernFanId" parameterType="String" resultType="Map">
+    SELECT
+    cf.id,
+    cf.concern_user_id,
+    cf.fan_user_id,
+    cf.`status`,
+    cf.create_time fan_create_time,
+    cf.remarks fan_remarks,
+    u.user_name,
+    u.nick_name,
+    u.user_type,
+    u.dept_id,
+    u.dept_name,
+    u.email,
+    u.phone,
+    u.sex,
+    u.avatar,
+    u.login_ip,
+    u.login_time,
+    u.create_by_id,
+    u.create_by_name,
+    u.create_time,
+    u.update_by_id,
+    u.update_by_name,
+    u.update_time,
+    u.remarks
+    FROM
+    common_push_concern_fan cf JOIN sys_user u
+    ON
+    cf.fan_user_id = u.id
+    <where>
+      cf.del_flag = 0 and u.status = 0
+      AND cf.id = #{id}
+    </where>
+  </select>
+
+
+</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanTypeMapper.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.PushMessageMapper">
+<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushConcernFanTypeMapper">
 
 </mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushEnterpriseMapper.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.PushUserManageMapper">
+<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushEnterpriseMapper">
 
 </mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushRingtoneMapper.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.PushPassListMapper">
+<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushRingtoneMapper">
 
 </mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushThirdPartyMapper.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.PushThirdPartyMapper">
-
-</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushTypeMapper.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.PushFileMapper">
+<mapper namespace="com.cloud.kicc.commonbiz.mapper.PushTypeMapper">
 
 </mapper>

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

@@ -18,11 +18,11 @@ public class SimpleCrudGeneratorTest {
     /** 代码生成全局配置 */
     interface Config {
 
-        String url = "jdbc:mysql://47.111.191.224:3306/kicc?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true";
+        String url = "jdbc:mysql://192.168.3.10:8052/kicc?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true";
 
-        String username = "u_kanglai_account";
+        String username = "root";
 
-        String password = "$kanglai.<2021>#";
+        String password = "kanglai@2022";
 
         String author = "wangxiang4";
 
@@ -44,7 +44,7 @@ public class SimpleCrudGeneratorTest {
 
         String packageController = "controller";
 
-        String[] includeTable = { "common_push_file" };
+        String[] includeTable = { "common_push_application", "common_push_blacklist", "common_push_chat_message", "common_push_concern_fan", "common_push_concern_fan_type", "common_push_enterprise", "common_push_ringtone", "common_push_type" };
 
         String[] filterEntityTablePrefix = { "common_" };