Browse Source

wx_c_user_tags添加分表

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
198f42ec9f
7 changed files with 23 additions and 14 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  2. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java
  3. +0
    -3
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java
  4. +4
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java
  5. +3
    -3
      mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java
  6. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java
  7. +8
    -0
      mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java View File

@@ -104,7 +104,7 @@ public class WxCUserBasicInfoController extends BaseController {
private void setUserInfoTag(WxCUserBasicInfo info) {

if (info.getTagId() != null) {
WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId());
WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId(),info.getFinalTenantId());
if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) {
List<Long> ids = JSONObject.parseArray(uTag.getTags(), Long.class);
info.setTagsList(wxCUserTagsService.findTagList(ifParentUpdateTenantInfo(), ids));


+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java View File

@@ -62,7 +62,7 @@ public class WxCUserTagsController extends BaseController {
@SystemControllerLog(description = "会员首页-标签-删除")
public ResultData delete(Long id) {
logger.debug("[" + getIpAddr() + "] WxCUserTagsController::delete");
wxCUserTagsService.deleteById(id);
wxCUserTagsService.deleteById(id,getTenantInfo().getFinalTenantId());
return new ResultData(Result.SUCCESS, "删除成功", null);
}

@@ -72,7 +72,7 @@ public class WxCUserTagsController extends BaseController {
@SystemControllerLog(description = "会员首页-标签-查询")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] WxCUserTagsController::findById");
return new ResultData(Result.SUCCESS, "查询成功", wxCUserTagsService.getById(id));
return new ResultData(Result.SUCCESS, "查询成功", wxCUserTagsService.getById(id,getTenantInfo().getFinalTenantId()));
}




+ 0
- 3
mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java View File

@@ -35,9 +35,6 @@ public class TenantEntity extends BaseEntity {
}
}

@TableField(exist = false)
protected String finalTenantId;

public String getFinalTenantId() {
if (!StringUtils.isBlank(parentTenantId)) {
return parentTenantId;


+ 4
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java View File

@@ -11,10 +11,14 @@ import org.apache.ibatis.annotations.Param;

public interface WxCUserTagsMapper extends CommonMapper<WxCUserTags, String> {

WxCUserTags selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
List<WxCUserTags> findList(WxCUserTags wxCUserTags);

long countUser(@Param("tagIds")String tagIds,@Param("tenantId")String tenantId,
@Param("startTime")Date startTime,@Param("endTime")Date endTime);

void updateNewId(CUserTagNewIdVo record);
int deleteById(@Param("id")Long id,@Param("tenantId")String tenantId);
}

+ 3
- 3
mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java View File

@@ -26,7 +26,7 @@ public interface WxCUserTagsService {
* @param id
* @return
*/
WxCUserTags getById(Long id);
WxCUserTags getById(Long id,String tenantId);
/**
* 保存或更新实体
@@ -40,14 +40,14 @@ public interface WxCUserTagsService {
*
* @param id
*/
void deleteById(Long id);
void deleteById(Long id,String tenantId);

long countUser(TenantEntity tenantEntity, Long tagId, Date startTime, Date endTime );

List<WxTags> findTagList(TenantEntity tenantEntity, List<Long> tagIds);


List<WxTags> assignTags(List<Long> tagIdList, WxCUserBasicInfo user);
List<WxTags> assignTags(List<Long> tagIdList,WxCUserBasicInfo user);
List<WxTags> triggerAssignTags(EnumAssignTagsTrigger trigger, Object obj);

void updateTagByUserId(Long cUserId,TenantEntity tenantinfo, List<Long> tags);


+ 5
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java View File

@@ -63,8 +63,8 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
}

@Override
public WxCUserTags getById(Long id) {
return wxCUserTagsMapper.selectById(id);
public WxCUserTags getById(Long id,String tenantId) {
return wxCUserTagsMapper.selectById(id,tenantId);
}

@Override
@@ -82,8 +82,8 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
}

@Override
public void deleteById(Long id) {
wxCUserTagsMapper.deleteById(id);
public void deleteById(Long id,String tenantId) {
wxCUserTagsMapper.deleteById(id,tenantId);
}


@@ -761,7 +761,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(cUserId,tenantinfo.getFinalTenantId());
WxCUserTags userTags = null;
if (wxCUserBasicInfo.getTagId() != null) {
userTags = getById(wxCUserBasicInfo.getTagId());
userTags = getById(wxCUserBasicInfo.getTagId(),wxCUserBasicInfo.getFinalTenantId());
} else {
userTags = new WxCUserTags();
userTags.setTags("[]");


+ 8
- 0
mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml View File

@@ -62,6 +62,14 @@
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>
<select id="selectById" parameterType="java.util.HashMap" resultMap="BaseResultMap">
select <include refid="allColumns"/> from wx_c_user_tags where id = #{id} and tenant_id = #{tenantId}
</select>
<delete id="deleteById" parameterType="java.util.HashMap">
delete from wx_c_user_tags where id = #{id} and tenant_id = #{tenantId}
</delete>

<select id="findList" parameterType="com.iformall.domain.po.WxCUserTags" resultMap="BaseResultMap">
select


Loading…
Cancel
Save