🚀 push 模块编写

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

@@ -30,16 +30,10 @@ public class PushApplication extends CommonEntity {
 
     private String name;
 
-    private Long pushSize;
-
-    private Long sendSize;
-
     private String status;
 
     private String url;
 
-    private String appKey;
-
     private String messageSecret;
 
 }

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

@@ -1,33 +0,0 @@
-package com.cloud.kicc.commonbiz.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.cloud.kicc.common.data.entity.CommonEntity;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-@TableName("common_push_blacklist")
-@ApiModel(value = "PushBlacklist对象", description = "")
-public class PushBlacklist extends CommonEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    private String pushId;
-
-}

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

@@ -20,34 +20,27 @@ import lombok.experimental.Accessors;
 @Getter
 @Setter
 @Accessors(chain = true)
-@TableName("common_push_certification")
+@TableName("common_push_custom_type")
-@ApiModel(value = "PushCertification对象", description = "")
+@ApiModel(value = "PushCustomType对象", description = "")
-public class PushCertification extends CommonEntity {
+public class PushCustomType extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 
     private String id;
 
+    @ApiModelProperty("自定义类型名称")
     private String name;
 
-    private String license;
+    @ApiModelProperty("紧急级别")
+    private String level;
 
-    private String phone;
+    @ApiModelProperty("是否震动")
+    private String isVibration;
 
-    private String idCard;
+    @ApiModelProperty("是否响铃")
+    private String isSound;
 
-    private String contact;
+    @ApiModelProperty("自定义铃声")
-
+    private String customSound;
-    private String creditCode;
-
-    private String type;
-
-    private String fileId;
-
-    private String status;
-
-    private String corpName;
-
-    private String detailedAddress;
 
 }

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

@@ -2,9 +2,7 @@ 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;
@@ -20,16 +18,18 @@ import lombok.experimental.Accessors;
 @Getter
 @Setter
 @Accessors(chain = true)
-@TableName("common_push_type")
+@TableName("common_push_pass_list")
-@ApiModel(value = "PushType对象", description = "")
+@ApiModel(value = "PushPassList对象", description = "")
-public class PushType extends CommonEntity {
+public class PushPassList extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 
     private String id;
 
+    private String pushManageId;
+
     private String name;
 
-    private String level;
+    private String type;
 
 }

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

@@ -0,0 +1,58 @@
+package com.cloud.kicc.commonbiz.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.cloud.kicc.common.data.entity.CommonEntity;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-02-16
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("common_push_third_party")
+@ApiModel(value = "PushThirdParty对象", description = "")
+public class PushThirdParty extends CommonEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    @ApiModelProperty("法定代表人姓名")
+    private String statutoryRepName;
+
+    @ApiModelProperty("法定代表人身份证")
+    private String idCard;
+
+    @ApiModelProperty("企业名称")
+    private String enterpName;
+
+    @ApiModelProperty("营业执照文件")
+    private String licenseFileId;
+
+    @ApiModelProperty("法定代表人手机号")
+    private String phone;
+
+    @ApiModelProperty("统一社会信用代码")
+    private String creditCode;
+
+    @ApiModelProperty("用户ID")
+    private String userId;
+
+    @ApiModelProperty("详细地址")
+    private String detailedAddress;
+
+    @ApiModelProperty("申请状态")
+    private String status;
+
+}

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

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

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

@@ -1,37 +0,0 @@
-package com.cloud.kicc.commonbiz.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.cloud.kicc.common.data.entity.CommonEntity;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-@TableName("common_push_todo_auth")
-@ApiModel(value = "PushTodoAuth对象", description = "")
-public class PushTodoAuth extends CommonEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    private String name;
-
-    private String certificationId;
-
-    private String status;
-
-}

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

@@ -3,8 +3,6 @@ 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 com.cloud.kicc.common.data.entity.TreeEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -22,18 +20,28 @@ import lombok.experimental.Accessors;
 @Getter
 @Setter
 @Accessors(chain = true)
-@TableName("common_push_manage")
+@TableName("common_push_user_manage")
-@ApiModel(value = "PushManage对象", description = "")
+@ApiModel(value = "PushUserManage对象", description = "")
-public class PushManage extends TreeEntity<PushManage> {
+public class PushUserManage extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 
+    private String id;
+
+    private String userId;
+
+    private String nickName;
+
+    private String sex;
+
+    private String avatar;
+
+    private String pushTypeId;
+
     private String isVibration;
 
     private String isSound;
 
-    private String appKey;
-
     private String customSound;
 
 }

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

@@ -1,33 +0,0 @@
-package com.cloud.kicc.commonbiz.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.cloud.kicc.common.data.entity.CommonEntity;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-@TableName("common_push_whitelist")
-@ApiModel(value = "PushWhitelist对象", description = "")
-public class PushWhitelist extends CommonEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    private String pushId;
-
-}

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

@@ -35,7 +35,8 @@ public class PushApplicationController {
 
     private LambdaQueryWrapper<PushApplication> getQueryWrapper(PushApplication pushApplication) {
         return new LambdaQueryWrapper<PushApplication>()
-                .eq(StrUtil.isNotBlank(pushApplication.getName()), PushApplication::getName, pushApplication.getName());
+                .eq(StrUtil.isNotBlank(pushApplication.getName()), PushApplication::getName, pushApplication.getName())
+                .eq(StrUtil.isNotBlank(pushApplication.getStatus()), PushApplication::getStatus, pushApplication.getStatus());
     }
 
     @GetMapping("/list")

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

@@ -1,74 +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.common.log.annotation.SysLog;
-import com.cloud.kicc.commonbiz.api.entity.PushApplication;
-import com.cloud.kicc.commonbiz.api.entity.PushBlacklist;
-import com.cloud.kicc.commonbiz.service.IPushApplicationService;
-import com.cloud.kicc.commonbiz.service.IPushBlacklistService;
-import com.cloud.kicc.system.api.entity.OauthClientDetails;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import javax.validation.Valid;
-import java.util.Arrays;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushBlacklist")
-@RequiredArgsConstructor
-public class PushBlacklistController {
-
-    private final IPushBlacklistService iPushBlacklistService;
-
-    private LambdaQueryWrapper<PushBlacklist> getQueryWrapper(PushBlacklist pushBlacklist) {
-        return new LambdaQueryWrapper<PushBlacklist>()
-                .eq(StrUtil.isNotBlank(pushBlacklist.getPushId()), PushBlacklist::getPushId, pushBlacklist.getPushId());
-    }
-
-    @GetMapping("/list")
-    public R list(Page page, PushBlacklist pushBlacklist) {
-        IPage<OauthClientDetails> list = iPushBlacklistService.page(page, getQueryWrapper(pushBlacklist));
-        return R.ok(list.getRecords(), list.getTotal());
-    }
-
-    @GetMapping("/{id:\\w+}")
-    public R getById(@PathVariable("id") String id) {
-        return R.ok(iPushBlacklistService.getById(id));
-    }
-
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody PushBlacklist pushBlacklist) {
-        iPushBlacklistService.save(pushBlacklist);
-        return R.ok();
-    }
-
-    @PutMapping("/update")
-    public R update(@Valid @RequestBody PushBlacklist pushBlacklist) {
-        iPushBlacklistService.updateById(pushBlacklist);
-        return R.ok();
-    }
-
-    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    public R<Boolean> removeById(@PathVariable String[] ids) {
-        iPushBlacklistService.removeByIds(Arrays.asList(ids));
-        return R.ok();
-    }
-
-}
-

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

@@ -1,69 +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.PushCertification;
-import com.cloud.kicc.commonbiz.service.IPushCertificationService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.Arrays;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushCertification")
-@RequiredArgsConstructor
-public class PushCertificationController {
-
-    private final IPushCertificationService iPushCertificationService;
-
-    private LambdaQueryWrapper<PushCertification> getQueryWrapper(PushCertification pushCertification) {
-        return new LambdaQueryWrapper<PushCertification>()
-                .eq(StrUtil.isNotBlank(pushCertification.getName()), PushCertification::getName, pushCertification.getName());
-    }
-
-    @GetMapping("/list")
-    public R list(Page page, PushCertification pushCertification) {
-        IPage<PushCertification> list = iPushCertificationService.page(page, getQueryWrapper(pushCertification));
-        return R.ok(list.getRecords(), list.getTotal());
-    }
-
-    @GetMapping("/{id:\\w+}")
-    public R getById(@PathVariable("id") String id) {
-        return R.ok(iPushCertificationService.getById(id));
-    }
-
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody PushCertification pushCertification) {
-        iPushCertificationService.save(pushCertification);
-        return R.ok();
-    }
-
-    @PutMapping("/update")
-    public R update(@Valid @RequestBody PushCertification pushCertification) {
-        iPushCertificationService.updateById(pushCertification);
-        return R.ok();
-    }
-
-    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    public R<Boolean> removeById(@PathVariable String[] ids) {
-        iPushCertificationService.removeByIds(Arrays.asList(ids));
-        return R.ok();
-    }
-
-}
-

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

@@ -0,0 +1,67 @@
+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.commonbiz.api.entity.PushCustomType;
+import com.cloud.kicc.commonbiz.service.IPushCustomTypeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Arrays;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-02-16
+ */
+@RestController
+@RequestMapping("/pushCustomType")
+@RequiredArgsConstructor
+public class PushCustomTypeController {
+
+    private final IPushCustomTypeService iPushCustomTypeService;
+
+    private LambdaQueryWrapper<PushCustomType> getQueryWrapper(PushCustomType pushCustomType) {
+        return new LambdaQueryWrapper<PushCustomType>()
+                .eq(StrUtil.isNotBlank(pushCustomType.getName()), PushCustomType::getName, pushCustomType.getName());
+    }
+
+    @GetMapping("/list")
+    public R list(Page page, PushCustomType pushCustomType) {
+        IPage<PushCustomType> list = iPushCustomTypeService.page(page, getQueryWrapper(pushCustomType));
+        return R.ok(list.getRecords(), list.getTotal());
+    }
+
+    @GetMapping("/{id:\\w+}")
+    public R getById(@PathVariable("id") String id) {
+        return R.ok(iPushCustomTypeService.getById(id));
+    }
+
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody PushCustomType pushCustomType) {
+        iPushCustomTypeService.save(pushCustomType);
+        return R.ok();
+    }
+
+    @PutMapping("/update")
+    public R update(@Valid @RequestBody PushCustomType pushCustomType) {
+        iPushCustomTypeService.updateById(pushCustomType);
+        return R.ok();
+    }
+
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    public R<Boolean> removeById(@PathVariable String[] ids) {
+        iPushCustomTypeService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+}
+

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

@@ -9,10 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
-import com.cloud.kicc.commonbiz.api.entity.PushManage;
-import com.cloud.kicc.commonbiz.service.IPushManageService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -30,80 +27,7 @@ import java.util.List;
 @RequiredArgsConstructor
 public class PushManageController {
 
-    private final IPushManageService iPushManageService;
 
-    private LambdaQueryWrapper<PushManage> getQueryWrapper(PushManage pushManage) {
-        return Wrappers.<PushManage>lambdaQuery()
-                .like(StrUtil.isNotBlank(pushManage.getName()), PushManage::getName, pushManage.getName())
-                .eq(StrUtil.isNotBlank(pushManage.getAppKey()), PushManage::getAppKey, pushManage.getAppKey())
-                .orderByAsc(PushManage::getSort);
-    }
-
-    @GetMapping("/list")
-    public R list(PushManage pushManage) {
-        List<PushManage> list = iPushManageService.list(getQueryWrapper(pushManage));
-        return R.ok(list, list.size());
-    }
-
-    @GetMapping("/listTree")
-    public R listTree() {
-        TreeNodeConfig treeNodeConfig = new TreeNodeConfig();
-        treeNodeConfig.setWeightKey("sort");
-        List<PushManage> list = iPushManageService.list(new LambdaQueryWrapper<PushManage>().orderByAsc(PushManage::getSort));
-        List<Tree<String>> listTree = TreeUtil.build(list, "0", treeNodeConfig, (treeNode, tree) -> {
-            tree.setId(treeNode.getId());
-            tree.setParentId(treeNode.getParentId());
-            tree.setWeight(treeNode.getSort());
-            tree.setName(treeNode.getName());
-            // 扩展属性
-            tree.putExtra("isVibration", treeNode.getIsVibration());
-            tree.putExtra("isSound", treeNode.getIsSound());
-            tree.putExtra("appKey", treeNode.getAppKey());
-            tree.putExtra("customSound", treeNode.getCustomSound());
-            tree.putExtra("createById", treeNode.getCreateById());
-            tree.putExtra("createByName", treeNode.getCreateByName());
-            tree.putExtra("createTime", treeNode.getCreateTime());
-            tree.putExtra("updateById", treeNode.getUpdateById());
-            tree.putExtra("updateByName", treeNode.getUpdateByName());
-            tree.putExtra("updateTime", treeNode.getUpdateTime());
-            tree.putExtra("remarks", treeNode.getRemarks());
-            tree.putExtra("beginTime", treeNode.getBeginTime());
-            tree.putExtra("endTime", treeNode.getEndTime());
-        });
-        return R.ok(listTree);
-    }
-
-    @GetMapping("/{id:\\w+}")
-    public R getById(@PathVariable("id") String id) {
-        return R.ok(iPushManageService.getById(id));
-    }
-
-    @PostMapping("/save")
-    public R save(@RequestBody PushManage pushManage) {
-        iPushManageService.save(pushManage);
-        return R.ok();
-    }
-
-    @PutMapping("/update")
-    public R update(@RequestBody PushManage pushManage) {
-        iPushManageService.updateById(pushManage);
-        return R.ok();
-    }
-
-    @DeleteMapping("/remove/{id:\\w+}")
-    public R remove(@PathVariable("id") String id) {
-        if (iPushManageService.getOne(Wrappers.<PushManage>lambdaQuery().eq(PushManage::getParentId, id)) != null) {
-            return R.error("存在下级用户,不允许删除");
-        }
-        iPushManageService.removeById(id);
-        return R.ok();
-    }
-
-    @GetMapping("/changeStatus")
-    public R changeStatus(PushManage pushManage) {
-        iPushManageService.updateById(pushManage);
-        return R.ok();
-    }
 
 }
 

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

@@ -0,0 +1,69 @@
+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 lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Arrays;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-02-16
+ */
+@RestController
+@RequestMapping(AppConstants.APP_COMMON + "/pushPassList")
+@RequiredArgsConstructor
+public class PushPassListController {
+
+    private final IPushPassListService iPushPassListService;
+
+    private LambdaQueryWrapper<PushPassList> getQueryWrapper(PushPassList pushBlacklist) {
+        return new LambdaQueryWrapper<PushPassList>()
+                .eq(StrUtil.isNotBlank(pushBlacklist.getPushManageId()), PushPassList::getPushManageId, pushBlacklist.getPushManageId())
+                .eq(StrUtil.isNotBlank(pushBlacklist.getType()), PushPassList::getType, pushBlacklist.getType());
+    }
+
+    @GetMapping("/list")
+    public R list(Page page, PushPassList pushPassList) {
+        IPage<PushPassList> list = iPushPassListService.page(page, getQueryWrapper(pushPassList));
+        return R.ok(list.getRecords(), list.getTotal());
+    }
+
+    @GetMapping("/{id:\\w+}")
+    public R getById(@PathVariable("id") String id) {
+        return R.ok(iPushPassListService.getById(id));
+    }
+
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody PushPassList pushPassList) {
+        iPushPassListService.save(pushPassList);
+        return R.ok();
+    }
+
+    @PutMapping("/update")
+    public R update(@Valid @RequestBody PushPassList pushPassList) {
+        iPushPassListService.updateById(pushPassList);
+        return R.ok();
+    }
+
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    public R<Boolean> removeById(@PathVariable String[] ids) {
+        iPushPassListService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+}
+

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

@@ -0,0 +1,69 @@
+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.PushThirdParty;
+import com.cloud.kicc.commonbiz.service.IPushThirdPartyService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Arrays;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-02-16
+ */
+@RestController
+@RequestMapping(AppConstants.APP_COMMON + "/pushThirdParty")
+@RequiredArgsConstructor
+public class PushThirdPartyController {
+
+    private final IPushThirdPartyService iPushThirdPartyService;
+
+    private LambdaQueryWrapper<PushThirdParty> getQueryWrapper(PushThirdParty pushThirdParty) {
+        return new LambdaQueryWrapper<PushThirdParty>()
+                .eq(StrUtil.isNotBlank(pushThirdParty.getEnterpName()), PushThirdParty::getEnterpName, pushThirdParty.getEnterpName())
+                .eq(StrUtil.isNotBlank(pushThirdParty.getStatus()), PushThirdParty::getStatus, pushThirdParty.getStatus());
+    }
+
+    @GetMapping("/list")
+    public R list(Page page, PushThirdParty pushThirdParty) {
+        IPage<PushThirdParty> list = iPushThirdPartyService.page(page, getQueryWrapper(pushThirdParty));
+        return R.ok(list.getRecords(), list.getTotal());
+    }
+
+    @GetMapping("/{id:\\w+}")
+    public R getById(@PathVariable("id") String id) {
+        return R.ok(iPushThirdPartyService.getById(id));
+    }
+
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody PushThirdParty pushThirdParty) {
+        iPushThirdPartyService.save(pushThirdParty);
+        return R.ok();
+    }
+
+    @PutMapping("/update")
+    public R update(@Valid @RequestBody PushThirdParty pushThirdParty) {
+        iPushThirdPartyService.updateById(pushThirdParty);
+        return R.ok();
+    }
+
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    public R<Boolean> removeById(@PathVariable String[] ids) {
+        iPushThirdPartyService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+}
+

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

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

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

@@ -1,72 +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.PushCertification;
-import com.cloud.kicc.commonbiz.api.entity.PushTodoAuth;
-import com.cloud.kicc.commonbiz.service.IPushCertificationService;
-import com.cloud.kicc.commonbiz.service.IPushTodoAuthService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import javax.validation.Valid;
-import java.util.Arrays;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushTodoAuth")
-@RequiredArgsConstructor
-public class PushTodoAuthController {
-
-    private final IPushTodoAuthService iPushTodoAuthService;
-
-    private LambdaQueryWrapper<PushTodoAuth> getQueryWrapper(PushTodoAuth pushTodoAuth) {
-        return new LambdaQueryWrapper<PushTodoAuth>()
-                .eq(StrUtil.isNotBlank(pushTodoAuth.getName()), PushTodoAuth::getName, pushTodoAuth.getName());
-    }
-
-    @GetMapping("/list")
-    public R list(Page page, PushTodoAuth pushTodoAuth) {
-        IPage<PushTodoAuth> list = iPushTodoAuthService.page(page, getQueryWrapper(pushTodoAuth));
-        return R.ok(list.getRecords(), list.getTotal());
-    }
-
-    @GetMapping("/{id:\\w+}")
-    public R getById(@PathVariable("id") String id) {
-        return R.ok(iPushTodoAuthService.getById(id));
-    }
-
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody PushTodoAuth pushTodoAuth) {
-        iPushTodoAuthService.save(pushTodoAuth);
-        return R.ok();
-    }
-
-    @PutMapping("/update")
-    public R update(@Valid @RequestBody PushTodoAuth pushTodoAuth) {
-        iPushTodoAuthService.updateById(pushTodoAuth);
-        return R.ok();
-    }
-
-    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    public R<Boolean> removeById(@PathVariable String[] ids) {
-        iPushTodoAuthService.removeByIds(Arrays.asList(ids));
-        return R.ok();
-    }
-
-}
-

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

@@ -1,69 +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.PushType;
-import com.cloud.kicc.commonbiz.service.IPushTypeService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.Arrays;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushType")
-@RequiredArgsConstructor
-public class PushTypeController {
-
-    private final IPushTypeService iPushTypeService;
-
-    private LambdaQueryWrapper<PushType> getQueryWrapper(PushType pushType) {
-        return new LambdaQueryWrapper<PushType>()
-                .eq(StrUtil.isNotBlank(pushType.getName()), PushType::getName, pushType.getName());
-    }
-
-    @GetMapping("/list")
-    public R list(Page page, PushType pushType) {
-        IPage<PushType> list = iPushTypeService.page(page, getQueryWrapper(pushType));
-        return R.ok(list.getRecords(), list.getTotal());
-    }
-
-    @GetMapping("/{id:\\w+}")
-    public R getById(@PathVariable("id") String id) {
-        return R.ok(iPushTypeService.getById(id));
-    }
-
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody PushType pushType) {
-        iPushTypeService.save(pushType);
-        return R.ok();
-    }
-
-    @PutMapping("/update")
-    public R update(@Valid @RequestBody PushType pushType) {
-        iPushTypeService.updateById(pushType);
-        return R.ok();
-    }
-
-    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    public R<Boolean> removeById(@PathVariable String[] ids) {
-        iPushTypeService.removeByIds(Arrays.asList(ids));
-        return R.ok();
-    }
-
-}
-

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

@@ -0,0 +1,72 @@
+package com.cloud.kicc.commonbiz.controller;
+
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cloud.kicc.common.core.api.R;
+import com.cloud.kicc.common.core.constant.AppConstants;
+import com.cloud.kicc.commonbiz.api.entity.PushThirdPartyManage;
+import com.cloud.kicc.commonbiz.api.entity.PushUserManage;
+import com.cloud.kicc.commonbiz.service.IPushThirdPartyManageService;
+import com.cloud.kicc.commonbiz.service.IPushUserManageService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.stereotype.Controller;
+
+import javax.validation.Valid;
+import java.util.Arrays;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wangxiang4
+ * @since 2023-02-16
+ */
+@RestController
+@RequestMapping(AppConstants.APP_COMMON + "/pushUserManage")
+@RequiredArgsConstructor
+public class PushUserManageController {
+
+    private final IPushUserManageService iPushUserManageService;
+
+    private LambdaQueryWrapper<PushUserManage> getQueryWrapper(PushUserManage pushUserManage) {
+        return new LambdaQueryWrapper<PushUserManage>()
+                .eq(StrUtil.isNotBlank(pushUserManage.getNickName()), PushUserManage::getNickName, pushUserManage.getNickName());
+    }
+
+    @GetMapping("/list")
+    public R list(Page page, PushUserManage pushUserManage) {
+        IPage<PushUserManage> list = iPushUserManageService.page(page, getQueryWrapper(pushUserManage));
+        return R.ok(list.getRecords(), list.getTotal());
+    }
+
+    @GetMapping("/{id:\\w+}")
+    public R getById(@PathVariable("id") String id) {
+        return R.ok(iPushUserManageService.getById(id));
+    }
+
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody PushUserManage pushUserManage) {
+        iPushUserManageService.save(pushUserManage);
+        return R.ok();
+    }
+
+    @PutMapping("/update")
+    public R update(@Valid @RequestBody PushUserManage pushUserManage) {
+        iPushUserManageService.updateById(pushUserManage);
+        return R.ok();
+    }
+
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    public R<Boolean> removeById(@PathVariable String[] ids) {
+        iPushUserManageService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+}
+

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

@@ -1,73 +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.PushBlacklist;
-import com.cloud.kicc.commonbiz.api.entity.PushWhitelist;
-import com.cloud.kicc.commonbiz.service.IPushBlacklistService;
-import com.cloud.kicc.commonbiz.service.IPushWhitelistService;
-import com.cloud.kicc.system.api.entity.OauthClientDetails;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
-
-import javax.validation.Valid;
-import java.util.Arrays;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author wangxiang4
- * @since 2023-02-16
- */
-@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/pushWhitelist")
-@RequiredArgsConstructor
-public class PushWhitelistController {
-
-    private final IPushWhitelistService iPushWhitelistService;
-
-    private LambdaQueryWrapper<PushWhitelist> getQueryWrapper(PushWhitelist pushWhitelist) {
-        return new LambdaQueryWrapper<PushWhitelist>()
-                .eq(StrUtil.isNotBlank(pushWhitelist.getPushId()), PushWhitelist::getPushId, pushWhitelist.getPushId());
-    }
-
-    @GetMapping("/list")
-    public R list(Page page, PushWhitelist pushWhitelist) {
-        IPage<PushWhitelist> list = iPushWhitelistService.page(page, getQueryWrapper(pushWhitelist));
-        return R.ok(list.getRecords(), list.getTotal());
-    }
-
-    @GetMapping("/{id:\\w+}")
-    public R getById(@PathVariable("id") String id) {
-        return R.ok(iPushWhitelistService.getById(id));
-    }
-
-    @PostMapping("/save")
-    public R save(@Valid @RequestBody PushWhitelist pushWhitelist) {
-        iPushWhitelistService.save(pushWhitelist);
-        return R.ok();
-    }
-
-    @PutMapping("/update")
-    public R update(@Valid @RequestBody PushWhitelist pushWhitelist) {
-        iPushWhitelistService.updateById(pushWhitelist);
-        return R.ok();
-    }
-
-    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    public R<Boolean> removeById(@PathVariable String[] ids) {
-        iPushWhitelistService.removeByIds(Arrays.asList(ids));
-        return R.ok();
-    }
-
-}
-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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_application", "common_push_blacklist", "common_push_certification", "common_push_manage", "common_push_todo_auth", "common_push_type", "common_push_whitelist" };
+        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[] filterEntityTablePrefix = { "common_" };