refactor: 更新需求部分逻辑

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/feign/RemotePushConcernFanService.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  *<p>
@@ -28,4 +29,7 @@ public interface RemotePushConcernFanService {
 	@PostMapping(value = AppConstants.APP_COMMON + "/pushConcernFan/enterpriseUserFanSave", headers = SecurityConstants.HEADER_FROM_IN)
 	R enterpriseUserFanSave(@RequestParam("innerEnterpriseUserId") String innerEnterpriseUserId, @RequestBody List<User> userList);
 
+	@PostMapping(value = AppConstants.APP_COMMON + "/pushConcernFan/removeUserPushData", headers = SecurityConstants.HEADER_FROM_IN)
+	R removeUserPushData(@RequestParam("innerEnterpriseUserId")Set<String> userIds);
+
 }

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

@@ -46,7 +46,8 @@ public class PushApplicationController {
         return new LambdaQueryWrapper<PushApplication>()
                 .eq(PushApplication::getCreateById, SecurityUtils.getUser().getId())
                 .eq(StrUtil.isNotBlank(pushApplication.getName()), PushApplication::getName, pushApplication.getName())
-                .eq(StrUtil.isNotBlank(pushApplication.getStatus()), PushApplication::getStatus, pushApplication.getStatus());
+                .eq(StrUtil.isNotBlank(pushApplication.getStatus()), PushApplication::getStatus, pushApplication.getStatus())
+                .orderByDesc(PushApplication::getCreateTime);
     }
 
     @ApiOperation("分页查询")

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

@@ -39,7 +39,8 @@ public class PushChatMessageController {
                 .eq(PushChatMessage::getUserId, SecurityUtils.getUser().getId())
                 .eq(StrUtil.isNotBlank(pushChatMessage.getStatus()), PushChatMessage::getStatus, pushChatMessage.getStatus())
                 .like(StrUtil.isNotBlank(pushChatMessage.getTitle()), PushChatMessage::getTitle, pushChatMessage.getTitle())
-                .eq(StrUtil.isNotBlank(pushChatMessage.getAlias()), PushChatMessage::getAlias, pushChatMessage.getAlias());
+                .eq(StrUtil.isNotBlank(pushChatMessage.getAlias()), PushChatMessage::getAlias, pushChatMessage.getAlias())
+                .orderByDesc(PushChatMessage::getCreateTime);
     }
 
     @GetMapping("/list")

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

@@ -38,7 +38,8 @@ public class PushConcernFanTypeController {
         return new LambdaQueryWrapper<PushConcernFanType>()
                 .eq(StrUtil.isNotBlank(pushConcernFanType.getConcernUserId()), PushConcernFanType::getConcernUserId, pushConcernFanType.getConcernUserId())
                 .eq(StrUtil.isNotBlank(pushConcernFanType.getFanUserId()), PushConcernFanType::getFanUserId, pushConcernFanType.getFanUserId())
-                .eq(StrUtil.isNotBlank(pushConcernFanType.getName()), PushConcernFanType::getName, pushConcernFanType.getName());
+                .eq(StrUtil.isNotBlank(pushConcernFanType.getName()), PushConcernFanType::getName, pushConcernFanType.getName())
+                .orderByAsc(PushConcernFanType::getCreateTime);
     }
 
     @ApiOperation("分页查询")

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

@@ -39,7 +39,8 @@ 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(StrUtil.isNotBlank(pushEnterprise.getStatus()), PushEnterprise::getStatus, pushEnterprise.getStatus())
+                .orderByAsc(PushEnterprise::getCreateTime);
     }
 
     @ApiOperation("分页查询")

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

@@ -7,9 +7,7 @@ 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.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;
@@ -38,7 +36,8 @@ public class PushRingtoneController {
     private LambdaQueryWrapper<PushRingtone> getQueryWrapper(PushRingtone pushRingtone) {
         return new LambdaQueryWrapper<PushRingtone>()
                 .eq(PushRingtone::getCreateById, pushRingtone.getCreateById())
-                .like(StrUtil.isNotBlank(pushRingtone.getName()), PushRingtone::getName, pushRingtone.getName());
+                .like(StrUtil.isNotBlank(pushRingtone.getName()), PushRingtone::getName, pushRingtone.getName())
+                .orderByAsc(PushRingtone::getCreateTime);
     }
 
     @ApiOperation("分页查询")

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

@@ -1,7 +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.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -48,7 +46,8 @@ public class PushTypeController {
     private LambdaQueryWrapper<PushType> getQueryWrapper(PushType pushType) {
         return new LambdaQueryWrapper<PushType>()
                 .eq(PushType::getCreateById, pushType.getCreateById())
-                .eq(StrUtil.isNotBlank(pushType.getName()), PushType::getName, pushType.getName());
+                .eq(StrUtil.isNotBlank(pushType.getName()), PushType::getName, pushType.getName())
+                .orderByAsc(PushType::getCreateTime);
     }
 
     @ApiOperation("分页查询")
@@ -71,7 +70,7 @@ public class PushTypeController {
     public R save(@Valid @RequestBody PushType pushType) {
         iPushTypeService.save(pushType);
         List<PushConcernFan> pushConcernFanList = iPushConcernFanService
-                .list(Wrappers.<PushConcernFan>lambdaQuery().eq(PushConcernFan::getFanUserId, SecurityUtils.getUser().getId()));
+                .list(Wrappers.<PushConcernFan>lambdaQuery().eq(PushConcernFan::getConcernUserId, SecurityUtils.getUser().getId()));
         List<PushConcernFanType> pushConcernFanTypeList = pushConcernFanList.stream().map(item -> new PushConcernFanType()
                 .setConcernFanId(item.getId())
                 .setName(pushType.getName())

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

@@ -35,6 +35,7 @@
       <if test="user.nickName != null and user.nickName != ''">
         AND u.nick_name LIKE CONCAT('%', #{user.nickName}, '%')
       </if>
+      ORDER BY create_time DESC
     </where>
   </select>
 

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

@@ -54,6 +54,7 @@
       <if test="map.nickName != null and map.nickName != ''">
         AND u.nick_name = #{map.nickName}
       </if>
+      ORDER BY cf.create_time ASC
     </where>
   </select>
 
@@ -98,6 +99,7 @@
     <where>
       cf.del_flag = 0 AND u.status = 0
       AND cf.id = #{id}
+      ORDER BY u.create_time ASC
     </where>
   </select>
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java

@@ -1,5 +1,6 @@
 package com.cloud.kicc.system.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -116,25 +117,18 @@ public class UserController {
         return R.ok(userService.getUserAuthority(user));
     }
 
-
-    @GetMapping("/test")
-    public R test(String id) {
-        List<User> userList = userService.list(Wrappers.<User>lambdaQuery()
-                .ne(User::getId, SecurityUtils.getUser().getId())
-                .notIn(User::getUserType, "2", "5"));
-        remotePushConcernFanService.enterpriseUserFanSave(id, userList);
-        return R.ok(userList);
-    }
-
     @SysLog("用户新增")
     @PostMapping("/save")
     @PreAuthorize("@pms.hasPermission('user_add')")
     public R save(@RequestBody User user) {
         user.setPassword(ENCODER.encode(user.getPassword()));
         userService.saveUser(user);
-        // 企业用户推送类型数据同步
-        if (StrUtil.equals(user.getUserType(), "2")) {
-            //remotePushConcernFanService.pushConcernFanSave(user.getId(), SecurityConstants.FROM_IN);
+        // 企业内部用户推送类型数据同步
+        if (StrUtil.equals(user.getUserType(), "5")) {
+            List<User> userList = userService.list(Wrappers.<User>lambdaQuery()
+                    .ne(User::getId, SecurityUtils.getUser().getId())
+                    .notIn(User::getUserType, "2", "5"));
+            remotePushConcernFanService.enterpriseUserFanSave(user.getId(), userList);
         }
         return R.ok();
     }
@@ -192,6 +186,7 @@ public class UserController {
         if (ArrayUtil.contains(ids, "1510539584287346688")) {
             return R.error("不允许删除超级管理员");
         }
+        remotePushConcernFanService.removeUserPushData(CollectionUtil.set(false, ids));
         userService.removeByIds(Arrays.asList(ids));
         return R.ok();
     }