diff --git a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/config/MybatisConfiguration.java b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/config/MybatisConfiguration.java
index 0834c95c..c3364761 100644
--- a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/config/MybatisConfiguration.java
+++ b/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());
+ }
+
}
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushApplication.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushApplication.java
index 3926b813..2492f100 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushApplication.java
+++ b/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.Setter;
+import lombok.Data;
import lombok.experimental.Accessors;
/**
*
- *
+ * 推送应用表
*
*
* @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
*/
-@Getter
-@Setter
+@Data
@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;
}
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushBlacklist.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushBlacklist.java
new file mode 100644
index 00000000..ee9c918f
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 黑名单表
+ *
+ *
+ * @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;
+
+}
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushMessage.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java
similarity index 69%
rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushMessage.java
rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java
index 857fa00d..2dcdf51a 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushMessage.java
+++ b/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;
/**
*
- * 消息发送
+ * 聊天消息表
*
*
- * @author entfrm开发团队-王翔
- * @since 2022-11-15
+ * @author wangxiang4
+ * @since 2023-03-24
*/
@Data
@Accessors(chain = true)
-@TableName("common_push_message")
-@ApiModel(value = "Message对象")
-public class PushMessage extends CommonEntity {
+@TableName("common_push_chat_message")
+@ApiModel(value = "PushChatMessage对象", description = "聊天消息表")
+public class PushChatMessage extends CommonEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键id")
private String id;
- @ApiModelProperty("发送方用户id")
- private String fromUserId;
+ @ApiModelProperty("推送方用户id")
+ private String userId;
+
+ @ApiModelProperty("推送用户id")
+ private String pushUserId;
@ApiModelProperty("消息类型")
private String type;
- @ApiModelProperty("自定义推送类型ID")
- private String customTypeId;
-
- @ApiModelProperty("消息状态 0-未读 1-已读")
+ @ApiModelProperty("消息状态 0-需要审核 1-未读 2-已读")
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("自定义播放文件名称")
- private String customPlayFileName;
+ @ApiModelProperty("在线铃声")
+ private String onlineRingtone;
@ApiModelProperty("自定义活动点击跳转内容")
private String custom;
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushConcernFan.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushConcernFan.java
new file mode 100644
index 00000000..2876094f
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 关注粉丝表
+ *
+ *
+ * @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;
+
+}
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushConcernFanType.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushConcernFanType.java
new file mode 100644
index 00000000..982de129
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 推送关注粉丝跟类型关联表
+ *
+ *
+ * @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;
+
+}
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushThirdParty.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushEnterprise.java
similarity index 69%
rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushThirdParty.java
rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushEnterprise.java
index ff0fe0d3..fb463299 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushThirdParty.java
+++ b/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;
/**
*
- *
+ * 第三方企业资料表
*
*
* @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
*/
@Getter
@Setter
@Accessors(chain = true)
-@TableName("common_push_third_party")
-@ApiModel(value = "PushThirdParty对象")
-public class PushThirdParty extends CommonEntity {
+@TableName("common_push_enterprise")
+@ApiModel(value = "PushEnterprise对象", description = "第三方企业资料表")
+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("营业执照文件")
- private String licenseFileId;
+ @ApiModelProperty("法定代表人姓名")
+ private String repName;
@ApiModelProperty("法定代表人手机号")
private String phone;
+ @ApiModelProperty("营业执照")
+ private String license;
+
+ @ApiModelProperty("绑定用户ID")
+ private String userId;
+
@ApiModelProperty("统一社会信用代码")
private String creditCode;
- @ApiModelProperty("用户ID")
- private String userId;
+ @ApiModelProperty("法定代表人身份证")
+ private String idCard;
+
+ @ApiModelProperty("0-待审核 1-审核通过")
+ private String status;
@ApiModelProperty("详细地址")
private String detailedAddress;
- @ApiModelProperty("申请状态")
- private String status;
-
}
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushFile.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushFile.java
deleted file mode 100644
index 42f2ade5..00000000
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushFile.java
+++ /dev/null
@@ -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;
-
-/**
- *
- *
- *
- *
- * @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;
-
-}
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushPassList.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushRingtone.java
similarity index 53%
rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushPassList.java
rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushRingtone.java
index c375f3cc..5abcb850 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushPassList.java
+++ b/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;
/**
*
- *
+ * 在线铃声表
*
*
* @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
*/
@Getter
@Setter
@Accessors(chain = true)
-@TableName("common_push_pass_list")
-@ApiModel(value = "PushPassList对象")
-public class PushPassList extends CommonEntity {
+@TableName("common_push_ringtone")
+@ApiModel(value = "PushRingtone对象", description = "在线铃声表")
+public class PushRingtone extends CommonEntity {
private static final long serialVersionUID = 1L;
private String id;
- private String fromPushId;
-
- private String toPushId;
+ @ApiModelProperty("铃声名称")
+ private String name;
- private String type;
+ @ApiModelProperty("铃声")
+ private String ringtone;
}
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushCustomType.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushType.java
similarity index 69%
rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushCustomType.java
rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushType.java
index f23b64b9..6f0fbc01 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushCustomType.java
+++ b/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;
/**
*
- * 自定义消息类型
+ * 推送类型
*
*
* @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
*/
@Getter
@Setter
@Accessors(chain = true)
-@TableName("common_push_custom_type")
-@ApiModel(value = "PushCustomType对象")
-public class PushCustomType extends CommonEntity {
+@TableName("common_push_type")
+@ApiModel(value = "PushType对象", description = "推送类型")
+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;
}
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushUserManage.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushUserManage.java
deleted file mode 100644
index 853cb649..00000000
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushUserManage.java
+++ /dev/null
@@ -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;
-
-/**
- *
- *
- *
- *
- * @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;
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java
index 3116d912..86d025a7 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java
+++ b/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();
- pushMessage.setRemarks(content);
- pushMessage.setTitle(SecurityUtils.getUser().getUsername() + "与你对接预设点");
+ PushChatMessage pushChatMessage = new PushChatMessage();
+ pushChatMessage.setRemarks(content);
+ 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) {
- if (!JSONUtil.isJson(pushMessage.getRemarks())) return R.error("当前消息体内不是json数据,请检查后重试!");
- MapLogisticPoint mapLogisticPoint = JSONObject.parseObject(pushMessage.getRemarks(), MapLogisticPoint.class);
+ public R confirmPresetPoint(@RequestBody PushChatMessage pushChatMessage) {
+ if (!JSONUtil.isJson(pushChatMessage.getRemarks())) return R.error("当前消息体内不是json数据,请检查后重试!");
+ MapLogisticPoint mapLogisticPoint = JSONObject.parseObject(pushChatMessage.getRemarks(), MapLogisticPoint.class);
iMapTaskService.confirmPresetPoint(mapLogisticPoint);
- iPushMessageService.removeById(pushMessage.getId());
+ iPushChatMessageService.removeById(pushChatMessage.getId());
return R.ok();
}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushApplicationController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushApplicationController.java
index e646a422..d92ff762 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushApplicationController.java
+++ b/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;
/**
*
- * 前端控制器
+ * 推送应用表 前端控制器
*
*
* @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 getQueryWrapper(PushApplication pushApplication) {
return new LambdaQueryWrapper()
@@ -65,7 +66,7 @@ public class PushApplicationController {
@PostMapping("/save")
public R save(@Valid @RequestBody PushApplication pushApplication) {
// 验证企业是否已经认证
- if (iPushThirdPartyService.count(Wrappers.lambdaQuery().eq(PushThirdParty::getUserId, SecurityUtils.getUser().getId())) == 0){
+ if (iPushEnterpriseService.count(Wrappers.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.lambdaQuery().eq(PushThirdParty::getUserId, SecurityUtils.getUser().getId())) == 0){
+ if (iPushEnterpriseService.count(Wrappers.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 removeById(@PathVariable String[] ids) {
- if (iPushThirdPartyService.count(Wrappers.lambdaQuery().eq(PushThirdParty::getUserId, SecurityUtils.getUser().getId())) == 0){
+ if (iPushEnterpriseService.count(Wrappers.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) {
- iPushApplicationService.messageSend(pushMessage);
+ public R mapPresetPointConfirmPushMsgTest(@Valid @RequestBody PushChatMessage pushChatMessage) {
+ iPushApplicationService.messageSend(pushChatMessage);
return R.ok(true);
}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushBlacklistController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushBlacklistController.java
new file mode 100644
index 00000000..b3c8be3d
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 黑名单表 前端控制器
+ *
+ *
+ * @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> 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 removeById(@PathVariable String[] ids) {
+ iPushBlacklistService.removeByIds(Arrays.asList(ids));
+ return R.ok();
+ }
+
+}
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java
new file mode 100644
index 00000000..43ffe9c3
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 聊天消息表 前端控制器
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@RestController
+@RequestMapping(AppConstants.APP_COMMON + "/pushChatMessage")
+@RequiredArgsConstructor
+@Api("聊天记录")
+public class PushChatMessageController {
+
+ private final IPushChatMessageService iPushChatMessageService;
+
+ private LambdaQueryWrapper getQueryWrapper(PushChatMessage pushChatMessage) {
+ return new LambdaQueryWrapper()
+ .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 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();
+ }
+
+}
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanController.java
new file mode 100644
index 00000000..fa8bab07
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 关注粉丝表 前端控制器
+ *
+ *
+ * @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> 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.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 removeById(@PathVariable String[] ids) {
+ iPushConcernFanService.removeByIds(Arrays.asList(ids));
+ return R.ok();
+ }
+
+}
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanTypeController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanTypeController.java
new file mode 100644
index 00000000..4cfe797d
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 推送关注粉丝跟类型关联表 前端控制器
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(AppConstants.APP_COMMON + "/pushConcernFanType")
+@Api("推送关注粉丝跟类型关联管理")
+public class PushConcernFanTypeController {
+
+ private final IPushConcernFanTypeService iPushConcernFanTypeService;
+
+ private LambdaQueryWrapper getQueryWrapper(PushConcernFanType pushConcernFanType) {
+ return new LambdaQueryWrapper()
+ .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 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();
+ }
+
+}
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushEnterpriseController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushEnterpriseController.java
new file mode 100644
index 00000000..0a12cd55
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 第三方企业资料表 前端控制器
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@RestController
+@RequestMapping("/pushEnterprise")
+@RequiredArgsConstructor
+@Api("第三方企业资料管理")
+public class PushEnterpriseController {
+
+ private final IPushEnterpriseService iPushEnterpriseService;
+
+ private LambdaQueryWrapper getQueryWrapper(PushEnterprise pushEnterprise) {
+ return new LambdaQueryWrapper()
+ .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 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.lambdaQuery().eq(PushEnterprise::getUserId, userId)));
+ }
+
+ @ApiOperation("保存")
+ @PostMapping("/save")
+ public R save(@Valid @RequestBody PushEnterprise pushEnterprise) {
+ if(iPushEnterpriseService.count(Wrappers.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 removeById(@PathVariable String[] ids) {
+ iPushEnterpriseService.removeByIds(Arrays.asList(ids));
+ return R.ok();
+ }
+
+ @ApiOperation("撤销申请")
+ @DeleteMapping("/revokeAuth")
+ public R revokeAuth() {
+ iPushEnterpriseService.remove(Wrappers.lambdaQuery().eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId()));
+ return R.ok();
+ }
+
+}
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushFileController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushFileController.java
deleted file mode 100644
index 134599cd..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushFileController.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author wangxiang4
- * @since 2023-02-26
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushFile")
-@RequiredArgsConstructor
-@Api(tags = "推送文件")
-public class PushFileController {
-
- private final IPushFileService iPushFileService;
-
- private LambdaQueryWrapper getQueryWrapper(PushFile pushFile) {
- return new LambdaQueryWrapper()
- .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 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();
- }
-
-}
-
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushMessageController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushMessageController.java
deleted file mode 100644
index cfa7a97e..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushMessageController.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author entfrm开发团队-王翔
- * @since 2022-11-15
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON +"/pushMessage")
-@RequiredArgsConstructor
-@Api(tags = "消息模块")
-public class PushMessageController {
-
- private final IPushMessageService iPushMessageService;
-
- private LambdaQueryWrapper getQueryWrapper(PushMessage pushMessage) {
- return new LambdaQueryWrapper()
- .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 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();
- }
-
-}
-
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushPassListController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushPassListController.java
deleted file mode 100644
index 12ef02ec..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushPassListController.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushPassList")
-@RequiredArgsConstructor
-@Api(tags = "推送黑名单白名单列表")
-public class PushPassListController {
-
- private final IPushPassListService iPushPassListService;
-
- private LambdaQueryWrapper getQueryWrapper(PushPassList pushBlacklist) {
- return new LambdaQueryWrapper()
- .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 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 removeById(@PathVariable String[] ids) {
- iPushPassListService.removeByIds(Arrays.asList(ids));
- return R.ok();
- }
-
-}
-
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushRingtoneController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushRingtoneController.java
new file mode 100644
index 00000000..25fa1eb9
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 在线铃声表 前端控制器
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@RestController
+@RequestMapping(AppConstants.APP_COMMON + "/pushRingtone")
+@RequiredArgsConstructor
+@Api("在线铃声管理")
+public class PushRingtoneController {
+
+ private final IPushRingtoneService iPushRingtoneService;
+
+ private LambdaQueryWrapper getQueryWrapper(PushRingtone pushRingtone) {
+ return new LambdaQueryWrapper()
+ .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 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 removeById(@PathVariable String[] ids) {
+ iPushRingtoneService.removeByIds(Arrays.asList(ids));
+ return R.ok();
+ }
+
+}
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushThirdPartyController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushThirdPartyController.java
deleted file mode 100644
index 5c50f450..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushThirdPartyController.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushThirdParty")
-@RequiredArgsConstructor
-@Api(tags = "第三方认证")
-public class PushThirdPartyController {
-
- private final IPushThirdPartyService iPushThirdPartyService;
-
- private LambdaQueryWrapper getQueryWrapper(PushThirdParty pushThirdParty) {
- return new LambdaQueryWrapper()
- .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 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.lambdaQuery().eq(PushThirdParty::getUserId, id)));
- }
-
- @ApiOperation("保存")
- @PostMapping("/save")
- public R save(@Valid @RequestBody PushThirdParty pushThirdParty) {
- if(iPushThirdPartyService.count(Wrappers.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 removeById(@PathVariable String[] ids) {
- iPushThirdPartyService.removeByIds(Arrays.asList(ids));
- return R.ok();
- }
-
- @ApiOperation("撤销申请")
- @DeleteMapping("/revokeAuth")
- public R revokeAuth() {
- iPushThirdPartyService.remove(Wrappers.lambdaQuery()
- .eq(PushThirdParty::getUserId, SecurityUtils.getUser().getId()));
- return R.ok();
- }
-
-}
-
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushCustomTypeController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushTypeController.java
similarity index 51%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushCustomTypeController.java
rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushTypeController.java
index c6f6986e..bcee4046 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushCustomTypeController.java
+++ b/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.service.IPushCustomTypeService;
+import com.cloud.kicc.commonbiz.api.entity.PushType;
+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;
/**
*
- * 前端控制器
+ * 推送类型 前端控制器
*
*
* @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
*/
@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushCustomType")
+@RequestMapping(AppConstants.APP_COMMON + "/pushType")
@RequiredArgsConstructor
-@Api(tags = "推送自定义通知类型")
-public class PushCustomTypeController {
+@Api("推送类型管理")
+public class PushTypeController {
- private final IPushCustomTypeService iPushCustomTypeService;
+ private final IPushTypeService iPushTypeService;
- private LambdaQueryWrapper getQueryWrapper(PushCustomType pushCustomType) {
- return new LambdaQueryWrapper()
- .eq(PushCustomType::getCreateById, SecurityUtils.getUser().getId())
- .eq(StrUtil.isNotBlank(pushCustomType.getName()), PushCustomType::getName, pushCustomType.getName());
+ private LambdaQueryWrapper getQueryWrapper(PushType pushType) {
+ return new LambdaQueryWrapper()
+ .eq(PushType::getCreateById, pushType.getCreateById())
+ .eq(StrUtil.isNotBlank(pushType.getName()), PushType::getName, pushType.getName());
}
@ApiOperation("分页查询")
@GetMapping("/list")
- public R list(Page page, PushCustomType pushCustomType) {
- IPage list = iPushCustomTypeService.page(page, getQueryWrapper(pushCustomType));
+ public R list(Page page, PushType pushType) {
+ pushType.setCreateById(SecurityUtils.getUser().getId());
+ IPage 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) {
- iPushCustomTypeService.save(pushCustomType);
+ public R save(@Valid @RequestBody PushType pushType) {
+ iPushTypeService.save(pushType);
return R.ok();
}
@ApiOperation("修改")
@PutMapping("/update")
- public R update(@Valid @RequestBody PushCustomType pushCustomType) {
- iPushCustomTypeService.updateById(pushCustomType);
+ public R update(@Valid @RequestBody PushType pushType) {
+ iPushTypeService.updateById(pushType);
return R.ok();
}
@ApiOperation("删除")
@DeleteMapping("/remove/{ids:[\\w,]+}")
public R removeById(@PathVariable String[] ids) {
- iPushCustomTypeService.removeByIds(Arrays.asList(ids));
+ iPushTypeService.removeByIds(Arrays.asList(ids));
return R.ok();
}
+
}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushUserManageController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushUserManageController.java
deleted file mode 100644
index f81ac3df..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushUserManageController.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushUserManage")
-@RequiredArgsConstructor
-@Api(tags = "第三方用户推送管理")
-public class PushUserManageController {
-
- private final IPushUserManageService iPushUserManageService;
-
- private LambdaQueryWrapper getQueryWrapper(PushUserManage pushUserManage) {
- return new LambdaQueryWrapper()
- .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 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.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 removeById(@PathVariable String[] ids) {
- iPushUserManageService.removeByIds(Arrays.asList(ids));
- return R.ok();
- }
-
-}
-
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushApplicationMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushApplicationMapper.java
index d918e058..947ef819 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushApplicationMapper.java
+++ b/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;
/**
*
- * Mapper 接口
+ * 推送应用表 Mapper 接口
*
*
* @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
*/
public interface PushApplicationMapper extends BaseMapper {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushBlacklistMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushBlacklistMapper.java
new file mode 100644
index 00000000..721249e6
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 黑名单表 Mapper 接口
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushBlacklistMapper extends BaseMapper {
+
+ @MapKey("concernUserId")
+ IPage> selectPushBlacklist(@Param("page") IPage> page, @Param("user") User user);
+
+ @MapKey("concernUserId")
+ Map getByPushBlacklistId(PushBlacklist pushBlacklist);
+
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushChatMessageMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushChatMessageMapper.java
new file mode 100644
index 00000000..d80a2339
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 聊天消息表 Mapper 接口
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushChatMessageMapper extends BaseMapper {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushConcernFanMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushConcernFanMapper.java
new file mode 100644
index 00000000..a7365e46
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 关注粉丝表 Mapper 接口
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushConcernFanMapper extends BaseMapper {
+
+ @MapKey("id")
+ IPage> selectPushConcernFanList(@Param("page") IPage> page, @Param("map") Map map);
+
+ @MapKey("id")
+ Map getByPushConcernFanId(String id);
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushConcernFanTypeMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushConcernFanTypeMapper.java
new file mode 100644
index 00000000..caa02c38
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 推送关注粉丝跟类型关联表 Mapper 接口
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushConcernFanTypeMapper extends BaseMapper {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushCustomTypeMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushCustomTypeMapper.java
deleted file mode 100644
index 9cc47ea7..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushCustomTypeMapper.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-public interface PushCustomTypeMapper extends BaseMapper {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushEnterpriseMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushEnterpriseMapper.java
new file mode 100644
index 00000000..832ef3fc
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 第三方企业资料表 Mapper 接口
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushEnterpriseMapper extends BaseMapper {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushFileMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushFileMapper.java
deleted file mode 100644
index bb7459d9..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushFileMapper.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author wangxiang4
- * @since 2023-02-26
- */
-public interface PushFileMapper extends BaseMapper {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushMessageMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushMessageMapper.java
deleted file mode 100644
index cb6f294f..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushMessageMapper.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author entfrm开发团队-王翔
- * @since 2022-11-15
- */
-public interface PushMessageMapper extends BaseMapper {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushPassListMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushPassListMapper.java
deleted file mode 100644
index 9360adf0..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushPassListMapper.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-public interface PushPassListMapper extends BaseMapper {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushRingtoneMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushRingtoneMapper.java
new file mode 100644
index 00000000..44f21e99
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 在线铃声表 Mapper 接口
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushRingtoneMapper extends BaseMapper {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushThirdPartyMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushThirdPartyMapper.java
deleted file mode 100644
index 7be144f0..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushThirdPartyMapper.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-public interface PushThirdPartyMapper extends BaseMapper {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushTypeMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushTypeMapper.java
new file mode 100644
index 00000000..b8eb5509
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 推送类型 Mapper 接口
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface PushTypeMapper extends BaseMapper {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushUserManageMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushUserManageMapper.java
deleted file mode 100644
index 790e861a..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushUserManageMapper.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-public interface PushUserManageMapper extends BaseMapper {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushApplicationService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushApplicationService.java
index a329d2d1..c70970ad 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushApplicationService.java
+++ b/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;
/**
*
- * 服务类
+ * 推送应用表 服务类
*
*
* @author wangxiang4
- * @since 2023-02-16
+ * @since 2023-03-24
*/
public interface IPushApplicationService extends IService {
@@ -19,6 +21,6 @@ public interface IPushApplicationService extends IService {
* @param
* @return
*/
- void messageSend(PushMessage pushMessage);
+ void messageSend(PushChatMessage pushChatMessage);
}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushBlacklistService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushBlacklistService.java
new file mode 100644
index 00000000..74bda138
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 黑名单表 服务类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushBlacklistService extends IService {
+
+ /**
+ * 查询黑名单列表
+ * @param
+ * @return
+ */
+ IPage> selectPushBlacklist(IPage> page, User user);
+
+ /**
+ * 根据推送黑名单ID查询
+ * @param
+ * @return
+ */
+ Map getByPushBlacklistId(PushBlacklist pushBlacklist);
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushChatMessageService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushChatMessageService.java
new file mode 100644
index 00000000..49d1df67
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 聊天消息表 服务类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushChatMessageService extends IService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushConcernFanService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushConcernFanService.java
new file mode 100644
index 00000000..1d11160a
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 关注粉丝表 服务类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushConcernFanService extends IService {
+
+ /**
+ * 查询列表
+ * @param
+ * @return
+ */
+ IPage> selectPushConcernFanList(IPage> page, Map map);
+
+ /**
+ * 根据ID查询
+ * @param
+ * @return
+ */
+ Map getByPushConcernFanId(String id);
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushConcernFanTypeService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushConcernFanTypeService.java
new file mode 100644
index 00000000..ba2e69ba
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 推送关注粉丝跟类型关联表 服务类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushConcernFanTypeService extends IService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushCustomTypeService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushCustomTypeService.java
deleted file mode 100644
index 773fff0b..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushCustomTypeService.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 服务类
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-public interface IPushCustomTypeService extends IService {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushEnterpriseService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushEnterpriseService.java
new file mode 100644
index 00000000..94a5b7d8
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 第三方企业资料表 服务类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushEnterpriseService extends IService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushFileService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushFileService.java
deleted file mode 100644
index 3313fbc2..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushFileService.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 服务类 todo: 需要移除
- *
- *
- * @author wangxiang4
- * @since 2023-02-26
- */
-@Deprecated
-public interface IPushFileService extends IService {
-
- /**
- * 上传文件
- * @param file
- * @return
- */
- Map uploadFile(MultipartFile file);
-
- /**
- * 删除文件
- * @param id
- * @return Boolean
- */
- void deleteFile(String id);
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushMessageService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushMessageService.java
deleted file mode 100644
index ce8b8878..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushMessageService.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 服务类
- *
- *
- * @author entfrm开发团队-王翔
- * @since 2022-11-15
- */
-public interface IPushMessageService extends IService {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushPassListService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushPassListService.java
deleted file mode 100644
index 23aee108..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushPassListService.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 服务类
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-public interface IPushPassListService extends IService {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushRingtoneService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushRingtoneService.java
new file mode 100644
index 00000000..afc05460
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 在线铃声表 服务类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushRingtoneService extends IService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushThirdPartyService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushThirdPartyService.java
deleted file mode 100644
index eaa1bcf1..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushThirdPartyService.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 服务类
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-public interface IPushThirdPartyService extends IService {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushTypeService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushTypeService.java
new file mode 100644
index 00000000..c94747bd
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 推送类型 服务类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+public interface IPushTypeService extends IService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushUserManageService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushUserManageService.java
deleted file mode 100644
index ebe8c2c6..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushUserManageService.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 服务类
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-public interface IPushUserManageService extends IService {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
index 6e674f91..f5a5efc2 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
+++ b/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;
/**
*
- * 服务实现类
+ * 推送应用表 服务实现类
*
*
* @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 implements IPushApplicationService {
private final OkHttpClient okHttpClient;
- private final IPushUserManageService iPushUserManageService;
- private final IPushMessageService iPushMessageService;
+ //private final IPushUserManageService iPushUserManageService;
+ //private final IPushMessageService iPushMessageService;
private final RemoteUserService remoteUserService;
- private final IPushCustomTypeService iPushCustomTypeService;
- private final IPushPassListService iPushPassListService;
+ //private final IPushCustomTypeService iPushCustomTypeService;
+
@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 result = remoteUserService.selectByUserId(pushMessage.getFromUserId(), SecurityConstants.FROM_IN);
+ R 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.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.lambdaQuery()
- .eq(PushCustomType::getId, pushMessage.getCustomTypeId()).eq(PushCustomType::getCreateById, pushMessage.getFromUserId()));
+ /*PushCustomType pushCustomType = iPushCustomTypeService.getOne(Wrappers.lambdaQuery()
+ .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 blacklist = iPushPassListService.list(Wrappers.lambdaQuery()
+ List blacklist = CollectionUtil.newArrayList(); /*iPushPassListService.list(Wrappers.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 whitelist = iPushPassListService.list(Wrappers.lambdaQuery()
+ List whitelist = CollectionUtil.newArrayList(); /*iPushPassListService.list(Wrappers.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 pushList = iPushUserManageService.list(Wrappers.lambdaQuery()
+ /*List pushList = iPushUserManageService.list(Wrappers.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
+ * 黑名单表 服务实现类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushBlacklistServiceImpl extends ServiceImpl implements IPushBlacklistService {
+
+ @Override
+ public IPage> selectPushBlacklist(IPage> page, User user) {
+ return baseMapper.selectPushBlacklist(page, user);
+ }
+
+ @Override
+ public Map getByPushBlacklistId(PushBlacklist pushBlacklist) {
+ return baseMapper.getByPushBlacklistId(pushBlacklist);
+ }
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushChatMessageServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushChatMessageServiceImpl.java
new file mode 100644
index 00000000..06ab4502
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 聊天消息表 服务实现类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushChatMessageServiceImpl extends ServiceImpl implements IPushChatMessageService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java
new file mode 100644
index 00000000..cf7acf56
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 关注粉丝表 服务实现类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushConcernFanServiceImpl extends ServiceImpl implements IPushConcernFanService {
+
+ @Override
+ public IPage> selectPushConcernFanList(IPage> page, Map map) {
+ return baseMapper.selectPushConcernFanList(page, map);
+ }
+
+ @Override
+ public Map getByPushConcernFanId(String id) {
+ return baseMapper.getByPushConcernFanId(id);
+ }
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanTypeServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanTypeServiceImpl.java
new file mode 100644
index 00000000..8ae02356
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 推送关注粉丝跟类型关联表 服务实现类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushConcernFanTypeServiceImpl extends ServiceImpl implements IPushConcernFanTypeService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushCustomTypeServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushCustomTypeServiceImpl.java
deleted file mode 100644
index 662668b9..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushCustomTypeServiceImpl.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@Service
-public class PushCustomTypeServiceImpl extends ServiceImpl implements IPushCustomTypeService {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushEnterpriseServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushEnterpriseServiceImpl.java
new file mode 100644
index 00000000..26d94ac2
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 第三方企业资料表 服务实现类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushEnterpriseServiceImpl extends ServiceImpl implements IPushEnterpriseService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushFileServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushFileServiceImpl.java
deleted file mode 100644
index b9916fc2..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushFileServiceImpl.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 服务实现类 todo: 需要移除
- *
- *
- * @author wangxiang4
- * @since 2023-02-26
- */
-@Deprecated
-@Service
-@RequiredArgsConstructor
-public class PushFileServiceImpl extends ServiceImpl 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 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);
- }
- }
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushMessageServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushMessageServiceImpl.java
deleted file mode 100644
index aa3e34e7..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushMessageServiceImpl.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author entfrm开发团队-王翔
- * @since 2022-11-15
- */
-@Service
-public class PushMessageServiceImpl extends ServiceImpl implements IPushMessageService {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushPassListServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushPassListServiceImpl.java
deleted file mode 100644
index 95989eee..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushPassListServiceImpl.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@Service
-public class PushPassListServiceImpl extends ServiceImpl implements IPushPassListService {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushRingtoneServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushRingtoneServiceImpl.java
new file mode 100644
index 00000000..3bbd9485
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 在线铃声表 服务实现类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushRingtoneServiceImpl extends ServiceImpl implements IPushRingtoneService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushThirdPartyServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushThirdPartyServiceImpl.java
deleted file mode 100644
index e29654ac..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushThirdPartyServiceImpl.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@Service
-public class PushThirdPartyServiceImpl extends ServiceImpl implements IPushThirdPartyService {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushTypeServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushTypeServiceImpl.java
new file mode 100644
index 00000000..07b289e0
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 推送类型 服务实现类
+ *
+ *
+ * @author wangxiang4
+ * @since 2023-03-24
+ */
+@Service
+public class PushTypeServiceImpl extends ServiceImpl implements IPushTypeService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushUserManageServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushUserManageServiceImpl.java
deleted file mode 100644
index 5c56f121..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushUserManageServiceImpl.java
+++ /dev/null
@@ -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;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@Service
-public class PushUserManageServiceImpl extends ServiceImpl implements IPushUserManageService {
-
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushBlacklistMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushBlacklistMapper.xml
new file mode 100644
index 00000000..711e37e5
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushBlacklistMapper.xml
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushCustomTypeMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushChatMessageMapper.xml
similarity index 67%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushCustomTypeMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushChatMessageMapper.xml
index b1fe3f87..258c454b 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushCustomTypeMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushChatMessageMapper.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml
new file mode 100644
index 00000000..b75aa624
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushMessageMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanTypeMapper.xml
similarity index 66%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushMessageMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanTypeMapper.xml
index b86d4f52..2bc8ac43 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushMessageMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanTypeMapper.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushUserManageMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushEnterpriseMapper.xml
similarity index 72%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushUserManageMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushEnterpriseMapper.xml
index ebfd821a..811ffe1e 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushUserManageMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushEnterpriseMapper.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushPassListMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushRingtoneMapper.xml
similarity index 72%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushPassListMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushRingtoneMapper.xml
index bc569491..c80c3d10 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushPassListMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushRingtoneMapper.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushThirdPartyMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushThirdPartyMapper.xml
deleted file mode 100644
index d5cacc78..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushThirdPartyMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushFileMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushTypeMapper.xml
similarity index 71%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushFileMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushTypeMapper.xml
index 98ce56bd..74a8624a 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushFileMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushTypeMapper.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/test/SimpleCrudGeneratorTest.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/test/SimpleCrudGeneratorTest.java
index 697d8dac..ed073028 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/test/SimpleCrudGeneratorTest.java
+++ b/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_" };