refactor: 重构推送审核状态字段逻辑

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

@@ -23,7 +23,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName("common_push_blacklist")
 @ApiModel(value = "PushBlacklist对象", description = "黑名单表")
-public class PushBlacklist implements Serializable {
+public class PushBlacklist extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -36,8 +36,11 @@ public class PushChatMessage extends CommonEntity {
     @ApiModelProperty("消息类型")
     private String type;
 
-    @ApiModelProperty("消息状态 0-未读 1-已读")
-    private String status;
+    @ApiModelProperty("审核状态：类型待顶")
+    private Integer status;
+
+    @ApiModelProperty("查看状态 0-未读 1-已读")
+    private String viewStatus;
 
     @ApiModelProperty("推送类型id")
     private String pushTypeId;

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

@@ -2,7 +2,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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -34,10 +33,10 @@ public class PushConcernFan extends CommonEntity {
     @ApiModelProperty("粉丝用户")
     private String fanUserId;
 
-    @ApiModelProperty("关注类型")
+    @ApiModelProperty("关注类型: 0-用户关注 1-内部企业关注")
     private String type;
 
-    @ApiModelProperty("0-需要审核 1-审核通过")
-    private String status;
+    @ApiModelProperty("审核状态：-1-驳回  0-需要审核 1-审核通过")
+    private Integer status;
 
 }

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

@@ -49,8 +49,8 @@ public class PushEnterprise extends CommonEntity {
     @ApiModelProperty("法定代表人身份证")
     private String idCard;
 
-    @ApiModelProperty("0-待审核 1-审核通过")
-    private String status;
+    @ApiModelProperty("审核状态: -1-驳回 0-待审核 1-审核通过")
+    private Integer status;
 
     @ApiModelProperty("详细地址")
     private String detailedAddress;

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

@@ -1,6 +1,7 @@
 package com.cloud.kicc.commonbiz.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,7 +38,7 @@ public class PushChatMessageController {
     private LambdaQueryWrapper<PushChatMessage> getQueryWrapper(PushChatMessage pushChatMessage) {
         return new LambdaQueryWrapper<PushChatMessage>()
                 .eq(PushChatMessage::getUserId, SecurityUtils.getUser().getId())
-                .eq(StrUtil.isNotBlank(pushChatMessage.getStatus()), PushChatMessage::getStatus, pushChatMessage.getStatus())
+                .eq(ObjectUtil.isNotEmpty(pushChatMessage.getStatus()), PushChatMessage::getStatus, pushChatMessage.getStatus())
                 .like(StrUtil.isNotBlank(pushChatMessage.getTitle()), PushChatMessage::getTitle, pushChatMessage.getTitle())
                 .eq(StrUtil.isNotBlank(pushChatMessage.getAlias()), PushChatMessage::getAlias, pushChatMessage.getAlias())
                 .orderByDesc(PushChatMessage::getCreateTime);

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

@@ -1,8 +1,6 @@
 package com.cloud.kicc.commonbiz.controller;
 
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,7 +14,6 @@ import com.cloud.kicc.system.api.entity.User;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.data.repository.query.Param;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -58,7 +55,6 @@ public class PushConcernFanController {
     @ApiOperation("分页查询好友列表")
     @GetMapping("/listFriend")
     public R removeById(Page page, @RequestParam Map map) {
-        map.put("createById", SecurityUtils.getUser().getId());
         IPage<Map<String, Object>> list = iPushConcernFanService.selectPushFriendList(page, map);
         return R.ok(list.getRecords(), list.getTotal());
     }
@@ -72,9 +68,13 @@ public class PushConcernFanController {
     @ApiOperation("保存")
     @PostMapping("/save")
     public R save(@Valid @RequestBody PushConcernFan pushConcernFan) {
+        // 关注可以重复申请，后者信息覆盖前者信息需先删除前者的关注数据
+        iPushConcernFanService.remove(Wrappers.<PushConcernFan>lambdaQuery()
+                .eq(PushConcernFan::getFanUserId, pushConcernFan.getFanUserId())
+                .eq(PushConcernFan::getConcernUserId, pushConcernFan.getConcernUserId()));
         iPushConcernFanService.save(pushConcernFan);
         // 同步推送类型
-        if (StrUtil.equals(pushConcernFan.getStatus(), "1")) {
+        if (pushConcernFan.getStatus() == 1) {
             List<PushType> pushTypes = iPushTypeService.list(Wrappers.<PushType>lambdaQuery().eq(PushType::getCreateById, pushConcernFan.getConcernUserId()));
             List<PushConcernFanType> pushConcernFanTypes = pushTypes.stream().map(item -> new PushConcernFanType()
                             .setName(item.getName())
@@ -113,37 +113,51 @@ public class PushConcernFanController {
             pushConcernFan.setFanUserId(item.getId());
             pushConcernFan.setConcernUserId(innerEnterpriseUserId);
             pushConcernFan.setType("1");
-            pushConcernFan.setStatus("1");
+            pushConcernFan.setStatus(1);
             iPushConcernFanService.save(pushConcernFan);
         });
         return R.ok();
     }
 
-    @ApiOperation("审核")
-    @GetMapping("/audit")
-    public R audit(String id) {
-        iPushConcernFanService.update(Wrappers.<PushConcernFan>lambdaUpdate().set(PushConcernFan::getStatus, "1").in(PushConcernFan::getId, id));
-        PushConcernFan pushConcernFan = iPushConcernFanService.getById(id);
+    @ApiOperation("更新审核状态")
+    @PutMapping("/updateAuditStatus")
+    public R updateAuditStatus(@RequestParam String id, @RequestParam Integer status) {
+        iPushConcernFanService.update(Wrappers.<PushConcernFan>lambdaUpdate()
+                .set(PushConcernFan::getStatus, status)
+                .eq(PushConcernFan::getId, id));
         // 同步推送类型
-        List<PushType> pushTypes = iPushTypeService.list(Wrappers.<PushType>lambdaQuery().eq(PushType::getCreateById, pushConcernFan.getConcernUserId()));
-        List<PushConcernFanType> pushConcernFanTypes = pushTypes.stream().map(item -> new PushConcernFanType()
-                .setName(item.getName())
-                .setConcernFanId(pushConcernFan.getId())
-                .setConcernUserId(pushConcernFan.getConcernUserId())
-                .setFanUserId(pushConcernFan.getFanUserId())
-                .setTypeId(item.getId())
-                .setDefaultType(item.getDefaultType())
-                .setPlaySound(item.getPlaySound())
-                .setPlayVibrate(item.getPlayVibrate())
-                .setPlayLights(item.getPlayLights())
-                .setPlayToText(item.getPlayToText())
-                .setOnlineRingtone(item.getOnlineRingtone())
-                .setOfflineRingtone(item.getOfflineRingtone())
+        if (status == 1) {
+            PushConcernFan pushConcernFan = iPushConcernFanService.getById(id);
+            List<PushType> pushTypes = iPushTypeService.list(Wrappers.<PushType>lambdaQuery()
+                    .eq(PushType::getCreateById, pushConcernFan.getConcernUserId()));
+            List<PushConcernFanType> pushConcernFanTypes = pushTypes.stream().map(item -> new PushConcernFanType()
+                    .setName(item.getName())
+                    .setConcernFanId(pushConcernFan.getId())
+                    .setConcernUserId(pushConcernFan.getConcernUserId())
+                    .setFanUserId(pushConcernFan.getFanUserId())
+                    .setTypeId(item.getId())
+                    .setDefaultType(item.getDefaultType())
+                    .setPlaySound(item.getPlaySound())
+                    .setPlayVibrate(item.getPlayVibrate())
+                    .setPlayLights(item.getPlayLights())
+                    .setPlayToText(item.getPlayToText())
+                    .setOnlineRingtone(item.getOnlineRingtone())
+                    .setOfflineRingtone(item.getOfflineRingtone())
             ).collect(Collectors.toList());
-        iPushConcernFanTypeService.saveBatch(pushConcernFanTypes);
+            iPushConcernFanTypeService.saveBatch(pushConcernFanTypes);
+        }
         return R.ok();
     }
 
+    @ApiOperation("驳回关注粉丝审核")
+    @PutMapping("/rejectAuth/{ids:[\\w,]+}")
+    public R<Boolean> rejectAuth(@PathVariable String[] ids) {
+        iPushConcernFanService.update(Wrappers.<PushConcernFan>lambdaUpdate()
+                .set(PushConcernFan::getStatus, -1)
+                .in(PushConcernFan::getId, ids));
+        return R.ok(true);
+    }
+
     @ApiOperation("删除")
     @DeleteMapping("/remove/{ids:[\\w,]+}")
     public R<Boolean> removeById(@PathVariable String[] ids) {

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

@@ -1,6 +1,7 @@
 package com.cloud.kicc.commonbiz.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -22,7 +23,7 @@ import java.util.Arrays;
 
 /**
  * <p>
- * 第三方企业资料表 前端控制器
+ * 推送企业管理 前端控制器
  * </p>
  *
  * @author wangxiang4
@@ -31,7 +32,7 @@ import java.util.Arrays;
 @RestController
 @RequestMapping(AppConstants.APP_COMMON + "/pushEnterprise")
 @RequiredArgsConstructor
-@Api(tags = "推送第三方企业资料管理")
+@Api(tags = "推送企业管理管理")
 public class PushEnterpriseController {
 
     private final IPushEnterpriseService iPushEnterpriseService;
@@ -39,7 +40,7 @@ public class PushEnterpriseController {
     private LambdaQueryWrapper<PushEnterprise> getQueryWrapper(PushEnterprise pushEnterprise) {
         return new LambdaQueryWrapper<PushEnterprise>()
                 .eq(StrUtil.isNotBlank(pushEnterprise.getName()), PushEnterprise::getName, pushEnterprise.getName())
-                .eq(StrUtil.isNotBlank(pushEnterprise.getStatus()), PushEnterprise::getStatus, pushEnterprise.getStatus())
+                .eq(ObjectUtil.isNotEmpty(pushEnterprise.getStatus()), PushEnterprise::getStatus, pushEnterprise.getStatus())
                 .orderByAsc(PushEnterprise::getCreateTime);
     }
 
@@ -50,16 +51,18 @@ public class PushEnterpriseController {
         return R.ok(list.getRecords(), list.getTotal());
     }
 
-    @ApiOperation("根据ID查询")
+    @ApiOperation("根据id查询")
     @GetMapping("/{id:\\w+}")
     public R getById(@PathVariable("id") String id) {
         return R.ok(iPushEnterpriseService.getById(id));
     }
 
-    @ApiOperation("根据用户ID查询")
-    @GetMapping("/getByUserId/{userId:\\w+}")
-    public R getByUserId(@PathVariable String userId) {
-        return R.ok(iPushEnterpriseService.getOne(Wrappers.<PushEnterprise>lambdaQuery().eq(PushEnterprise::getUserId, userId)));
+    @ApiOperation("获取企业认证成功数据")
+    @GetMapping("/getAuthData")
+    public R getAuthData() {
+        return R.ok(iPushEnterpriseService.getOne(Wrappers.<PushEnterprise>lambdaQuery()
+                .eq(PushEnterprise::getStatus, 1)
+                .eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId())));
     }
 
     @ApiOperation("保存")
@@ -91,10 +94,21 @@ public class PushEnterpriseController {
         return R.ok();
     }
 
-    @ApiOperation("撤销申请")
-    @DeleteMapping("/revokeAuth")
-    public R<Boolean> revokeAuth() {
-        iPushEnterpriseService.remove(Wrappers.<PushEnterprise>lambdaQuery().eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId()));
+    @ApiOperation("驳回企业审核")
+    @PutMapping("/rejectAuth/{ids:[\\w,]+}")
+    public R<Boolean> rejectAuth(@PathVariable String[] ids) {
+        iPushEnterpriseService.update(Wrappers.<PushEnterprise>lambdaUpdate()
+                .set(PushEnterprise::getStatus, -1)
+                .in(PushEnterprise::getId, ids));
+        return R.ok(true);
+    }
+
+    @ApiOperation("修改企业审核状态")
+    @PutMapping("/updateAuditStatus/{status:\\d}")
+    public R updateAuditStatus(@PathVariable Integer status) {
+        iPushEnterpriseService.update(Wrappers.<PushEnterprise>lambdaUpdate()
+                .set(PushEnterprise::getStatus, status)
+                .eq(PushEnterprise::getUserId, SecurityUtils.getUser().getId()));
         return R.ok();
     }
 

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

@@ -7,6 +7,8 @@
     bl.id,
     bl.concern_user_id,
     bl.fan_user_id,
+    bl.create_time bl_create_time,
+    bl.remarks bl_remarks,
     u.user_name,
     u.nick_name,
     u.user_type,
@@ -44,6 +46,8 @@
     bl.id,
     bl.concern_user_id,
     bl.fan_user_id,
+    bl.create_time bl_create_time,
+    bl.remarks bl_remarks,
     u.user_name,
     u.nick_name,
     u.user_type,

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

@@ -7,9 +7,9 @@
     cf.id,
     cf.concern_user_id,
     cf.fan_user_id,
-    cf.`status`,
-    cf.create_time fan_create_time,
-    cf.remarks fan_remarks,
+    cf.`status` cf_status,
+    cf.create_time cf_create_time,
+    cf.remarks cf_remarks,
     cf.type cf_type,
     u.user_name,
     u.nick_name,
@@ -63,9 +63,9 @@
     cf.id,
     cf.concern_user_id,
     cf.fan_user_id,
-    cf.`status`,
-    cf.create_time fan_create_time,
-    cf.remarks fan_remarks,
+    cf.`status` cf_status,
+    cf.create_time cf_create_time,
+    cf.remarks cf_remarks,
     cf.type cf_type,
     u.user_name,
     u.nick_name,
@@ -106,18 +106,22 @@
   <select id="selectPushFriendList" resultType="Map">
     SELECT
     cf.`status` cf_status,
-    b.id b_id,
     cf.type cf_type,
+    b.id bl_id,
     u.*
     FROM
     sys_user u
-    LEFT JOIN (select * FROM common_push_concern_fan WHERE del_flag = 0 and fan_user_id = #{map.createById}) cf ON u.id = cf.concern_user_id
-    LEFT JOIN common_push_blacklist b ON u.id = b.concern_user_id
+    LEFT JOIN (select * FROM common_push_concern_fan
+                        WHERE del_flag = 0
+                        AND fan_user_id = ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}) cf
+    ON u.id = cf.concern_user_id
+    LEFT JOIN common_push_blacklist b
+    ON u.id = b.concern_user_id
     <where>
-      u.del_flag = 0 AND u.status = 0 AND u.user_type not in(2,5)
-      <if test="map.createById != null and map.createById != ''">
-        AND u.id != #{map.createById}
-      </if>
+      u.del_flag = 0
+      AND u.status = 0
+      AND u.user_type not in(2,5)
+      AND u.id != ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}
       <if test="map.nickName != null and map.nickName != ''">
         AND u.nick_name = #{map.nickName}
       </if>