Browse Source

perf: 优化整体推送代码,提高可维护性

master
wangxiang 2 years ago
parent
commit
333f29d6ad
  1. 2
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java
  2. 4
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushConcernFan.java
  3. 2
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushEnterprise.java
  4. 6
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml
  5. 2
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java
  6. 4
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java

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

@ -36,7 +36,7 @@ public class PushChatMessage extends CommonEntity { @@ -36,7 +36,7 @@ public class PushChatMessage extends CommonEntity {
@ApiModelProperty("消息类型")
private String type;
@ApiModelProperty("审核状态:类型待顶")
@ApiModelProperty("审核状态")
private Integer status;
@ApiModelProperty("查看状态 0-未读 1-已读")

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

@ -33,10 +33,10 @@ public class PushConcernFan extends CommonEntity { @@ -33,10 +33,10 @@ public class PushConcernFan extends CommonEntity {
@ApiModelProperty("粉丝用户")
private String fanUserId;
@ApiModelProperty("关注类型: 0-用户关注 1-内部企业关注")
@ApiModelProperty("关注类型")
private String type;
@ApiModelProperty("审核状态:-1-驳回 0-需要审核 1-审核通过")
@ApiModelProperty("审核状态")
private Integer status;
}

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

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

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

@ -103,6 +103,7 @@ @@ -103,6 +103,7 @@
</where>
</select>
<!-- todo: 多条 common_push_concern_fan 相同跟 sys_user 关联可能会出现问题 -->
<select id="selectPushFriendList" resultType="Map">
SELECT
cf.`status` cf_status,
@ -120,7 +121,10 @@ @@ -120,7 +121,10 @@
<where>
u.del_flag = 0
AND u.status = 0
AND u.user_type not in(2,5)
AND u.user_type not in(
${@com.cloud.kicc.system.api.enums.UserTypeEnum@ENTERPRISE_USER.value},
${@com.cloud.kicc.system.api.enums.UserTypeEnum@INTERNAL_USER.value}
)
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}

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

@ -46,7 +46,7 @@ public class TenantController { @@ -46,7 +46,7 @@ public class TenantController {
}
@GetMapping("/list")
@PreAuthorize("@pms.hasPermission('tenant_view')")
//@PreAuthorize("@pms.hasPermission('tenant_view')")
public R list(Page page, Tenant tenant) {
IPage<Tenant> tenantPage = tenantService.page(page, getQueryWrapper(tenant));
return R.ok(tenantPage.getRecords(), tenantPage.getTotal());

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

@ -139,10 +139,10 @@ public class UserController { @@ -139,10 +139,10 @@ public class UserController {
user.setPassword(ENCODER.encode(user.getPassword()));
userService.saveUser(user);
// 企业内部用户推送类型数据同步
if (StrUtil.equals(user.getUserType(), "5")) {
if (StrUtil.equals(user.getUserType(), UserTypeEnum.INTERNAL_USER.getValue())) {
List<User> userList = userService.list(Wrappers.<User>lambdaQuery()
.ne(User::getId, SecurityUtils.getUser().getId())
.notIn(User::getUserType, "2", "5"));
.notIn(User::getUserType, UserTypeEnum.ENTERPRISE_USER.getValue(), UserTypeEnum.INTERNAL_USER.getValue()));
remotePushConcernFanService.enterpriseUserFanSave(user.getId(), userList);
}
return R.ok();

Loading…
Cancel
Save