🚀 push 模块编写

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;
 
 /**
  * <p>
- * 
+ * 推送记录
  * </p>
  *
  * @author wangxiang4
@@ -61,8 +61,5 @@ public class PushRecord extends CommonEntity {
     @ApiModelProperty("自定义铃声")
     private String customSound;
 
-    @ApiModelProperty("删除标志（0代表存在 1代表删除）")
-    private String delFlag;
-
 
 }

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;
 
 /**
  * <p>
@@ -13,9 +26,55 @@ import org.springframework.stereotype.Controller;
  * @author wangxiang4
  * @since 2023-02-17
  */
-@Controller
+@RestController
-@RequestMapping("/pushRecord")
+@RequestMapping(AppConstants.APP_COMMON + "/pushRecord")
+@RequiredArgsConstructor
+@Api(tags = "推送消息记录")
 public class PushRecordController {
 
+    private final IPushRecordService iPushRecordService;
+
+    private LambdaQueryWrapper<PushRecord> getQueryWrapper(PushRecord pushRecord) {
+        return new LambdaQueryWrapper<PushRecord>()
+                .like(StrUtil.isNotBlank(pushRecord.getTitle()), PushRecord::getTitle, pushRecord.getTitle())
+                .eq(StrUtil.isNotBlank(pushRecord.getApplicationId()), PushRecord::getApplicationId, pushRecord.getApplicationId())
+                .eq(StrUtil.isNotBlank(pushRecord.getAliasUserId()), PushRecord::getAliasUserId, pushRecord.getAliasUserId())
+                .eq(StrUtil.isNotBlank(pushRecord.getAliasType()), PushRecord::getAliasType, pushRecord.getAliasType());
+    }
+
+    @ApiOperation("分页查询")
+    @GetMapping("/list")
+    public R list(Page page, PushRecord pushRecord) {
+        IPage<PushThirdParty> list = iPushRecordService.page(page, getQueryWrapper(pushRecord));
+        return R.ok(list.getRecords(), list.getTotal());
+    }
+
+    @ApiOperation("根据ID查询")
+    @GetMapping("/{id:\\w+}")
+    public R getById(@PathVariable("id") String id) {
+        return R.ok(iPushRecordService.getById(id));
+    }
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody PushRecord pushRecord) {
+        iPushRecordService.save(pushRecord);
+        return R.ok();
+    }
+
+    @ApiOperation("修改")
+    @PutMapping("/update")
+    public R update(@Valid @RequestBody PushRecord pushRecord) {
+        iPushRecordService.updateById(pushRecord);
+        return R.ok();
+    }
+
+    @ApiOperation("删除")
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    public R<Boolean> removeById(@PathVariable String[] ids) {
+        iPushRecordService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
 }
 

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

@@ -218,7 +218,7 @@ public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLo
         jsonObject.put("type", "customizedcast");
         jsonObject.put("alias_type", PushClientUtil.uPushUserAliasType);
         // todo:这里需要处理一下地图点中加入下一个地图点ID方便拿下一个用户ID
-        jsonObject.put("alias", "1562406147860549633");
+        jsonObject.put("alias", "1510539584287346688");
         jsonObject.put("mipush", "false");
         JSONObject policy = new JSONObject();
         policy.put("expire_time", LocalDateTimeUtil.now().plusDays(3)

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/PushClientUtil.java

@@ -28,11 +28,11 @@ public class PushClientUtil {
 
 	protected static final String postPath = "/api/send";
 
-    public static final String uAppKey = "637609c2ac3647427000a9e2";
+    public static final String uAppKey = "63eee076d64e686139315c30";
 
-    public static final String uAppMasterSecret = "96621e752731bfa57294fbdf08c5a6f8";
+    public static final String uAppMasterSecret = "1fbdb557f8ee84653ec19f622f7503d2";
 
-	public static final String uMessageSecret = "1x6hmlberweewjw6unwbcqff7yyfgmip";
+	public static final String uMessageSecret = "5plfnl3z4gyebwgzqjbvipciytdkx008";
 
     public static final String uPushUserAliasType = "KICC_UID";
 

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

@@ -44,7 +44,7 @@ public class SimpleCrudGeneratorTest {
 
         String packageController = "controller";
 
-        String[] includeTable = { "common_push_third_party", "common_push_third_party_manage", "common_push_third_party_todo", "common_push_custom_type", "common_push_user_manage" };
+        String[] includeTable = { "common_push_record" };
 
         String[] filterEntityTablePrefix = { "common_" };