From 818b2e9e0313866b626a3bc536e2e5ecc4f2c44f Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Fri, 17 Feb 2023 15:28:57 +0800
Subject: [PATCH] =?UTF-8?q?:rocket:=20push=20=E6=A8=A1=E5=9D=97=E7=BC=96?=
=?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../kicc/commonbiz/api/entity/PushRecord.java | 5 +-
.../controller/PushRecordController.java | 67 +++++++++++++++++--
.../service/impl/MapLogisticServiceImpl.java | 2 +-
.../kicc/commonbiz/util/PushClientUtil.java | 6 +-
.../main/test/SimpleCrudGeneratorTest.java | 2 +-
5 files changed, 69 insertions(+), 13 deletions(-)
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushRecord.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushRecord.java
index c987b8cd..5a946a64 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushRecord.java
+++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushRecord.java
@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
/**
*
- *
+ * 推送记录
*
*
* @author wangxiang4
@@ -61,8 +61,5 @@ public class PushRecord extends CommonEntity {
@ApiModelProperty("自定义铃声")
private String customSound;
- @ApiModelProperty("删除标志（0代表存在 1代表删除）")
- private String delFlag;
-
}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushRecordController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushRecordController.java
index f41953ab..9bac682c 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushRecordController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushRecordController.java
@@ -1,9 +1,22 @@
package com.cloud.kicc.commonbiz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cloud.kicc.common.core.api.R;
+import com.cloud.kicc.common.core.constant.AppConstants;
+import com.cloud.kicc.commonbiz.api.entity.PushRecord;
+import com.cloud.kicc.commonbiz.api.entity.PushThirdParty;
+import com.cloud.kicc.commonbiz.service.IPushRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import javax.validation.Valid;
+import java.util.Arrays;
/**
*
@@ -13,9 +26,55 @@ import org.springframework.stereotype.Controller;
* @author wangxiang4
* @since 2023-02-17
*/
-@Controller
-@RequestMapping("/pushRecord")
+@RestController
+@RequestMapping(AppConstants.APP_COMMON + "/pushRecord")
+@RequiredArgsConstructor
+@Api(tags = "推送消息记录")
public class PushRecordController {
+ private final IPushRecordService iPushRecordService;
+
+ private LambdaQueryWrapper getQueryWrapper(PushRecord pushRecord) {
+ return new LambdaQueryWrapper()
+ .like(StrUtil.isNotBlank(pushRecord.getTitle()), PushRecord::getTitle, pushRecord.getTitle())
+ .eq(StrUtil.isNotBlank(pushRecord.getApplicationId()), PushRecord::getApplicationId, pushRecord.getApplicationId())
+ .eq(StrUtil.isNotBlank(pushRecord.getAliasUserId()), PushRecord::getAliasUserId, pushRecord.getAliasUserId())
+ .eq(StrUtil.isNotBlank(pushRecord.getAliasType()), PushRecord::getAliasType, pushRecord.getAliasType());
+ }
+
+ @ApiOperation("分页查询")
+ @GetMapping("/list")
+ public R list(Page page, PushRecord pushRecord) {
+ IPage list = iPushRecordService.page(page, getQueryWrapper(pushRecord));
+ return R.ok(list.getRecords(), list.getTotal());
+ }
+
+ @ApiOperation("根据ID查询")
+ @GetMapping("/{id:\\w+}")
+ public R getById(@PathVariable("id") String id) {
+ return R.ok(iPushRecordService.getById(id));
+ }
+
+ @ApiOperation("保存")
+ @PostMapping("/save")
+ public R save(@Valid @RequestBody PushRecord pushRecord) {
+ iPushRecordService.save(pushRecord);
+ return R.ok();
+ }
+
+ @ApiOperation("修改")
+ @PutMapping("/update")
+ public R update(@Valid @RequestBody PushRecord pushRecord) {
+ iPushRecordService.updateById(pushRecord);
+ return R.ok();
+ }
+
+ @ApiOperation("删除")
+ @DeleteMapping("/remove/{ids:[\\w,]+}")
+ public R removeById(@PathVariable String[] ids) {
+ iPushRecordService.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/service/impl/MapLogisticServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java
index 896dabfd..410c249c 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java
@@ -218,7 +218,7 @@ public class MapLogisticServiceImpl extends ServiceImpl