moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

表情包列表添加tabName

Browse Source
This commit is contained in:
hokli
2025-05-06 15:46:26 +08:00
parent 5475721f54
commit 894edd9710
7 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/face/FaceNewAdminController.java
View File

@@ -2,10 +2,12 @@ package com.accompany.admin.controller.face;
import com.accompany.business.model.face.FaceNew;
import com.accompany.business.model.face.FaceTabNew;
import com.accompany.business.model.face.vo.FaceNewAdminVo;
import com.accompany.business.param.BasePageParams;
import com.accompany.business.service.face.FaceNewService;
import com.accompany.business.service.face.FaceTabNewService;
import com.accompany.common.result.BusiResult;
import com.accompany.common.result.PageResult;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -41,8 +43,8 @@ public class FaceNewAdminController {
})
@ApiOperation(value = "表情包列表", httpMethod = "GET")
@GetMapping(value = "/list")
public BusiResult<IPage<FaceNew>> listPage(Integer id, Integer tabId, Integer status, BasePageParams basePageParams) {
IPage<FaceNew> faceList = faceNewService.listPage(id, tabId, status,basePageParams);
public BusiResult<PageResult<FaceNewAdminVo>> listPage(Integer id, Integer tabId, Integer status, BasePageParams basePageParams) {
PageResult<FaceNewAdminVo> faceList = faceNewService.listPage(id, tabId, status,basePageParams);
return BusiResult.success(faceList);
}

1
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/face/FaceTabNewAdminController.java
View File

@@ -4,6 +4,7 @@ import com.accompany.business.model.face.FaceTabNew;
import com.accompany.business.param.BasePageParams;
import com.accompany.business.service.face.FaceTabNewService;
import com.accompany.common.result.BusiResult;
import com.accompany.common.result.PageResult;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

9
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/face/vo/FaceNewAdminVo.java Normal file
View File

@@ -0,0 +1,9 @@
package com.accompany.business.model.face.vo;
import com.accompany.business.model.face.FaceNew;
import lombok.Data;
@Data
public class FaceNewAdminVo extends FaceNew {
private String tabName;
}

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/face/FaceNewService.java
View File

@@ -1,8 +1,10 @@
package com.accompany.business.service.face;
import com.accompany.business.model.face.FaceNew;
import com.accompany.business.model.face.vo.FaceNewAdminVo;
import com.accompany.business.model.face.vo.FaceNewVo;
import com.accompany.business.param.BasePageParams;
import com.accompany.common.result.PageResult;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -17,7 +19,7 @@ import java.util.List;
* @since 2024-12-27
*/
public interface FaceNewService extends IService<FaceNew> {
IPage<FaceNew> listPage(Integer id, Integer tabId, Integer status, BasePageParams basePageParams);
PageResult<FaceNewAdminVo> listPage(Integer id, Integer tabId, Integer status, BasePageParams basePageParams);
List<FaceNewVo> faceList(Integer faceId);
void saveOrUpdage(FaceNew faceNew);

5
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/face/FaceTabNewService.java
View File

@@ -1,13 +1,16 @@
package com.accompany.business.service.face;
import com.accompany.business.model.face.FaceTabNew;
import com.accompany.business.model.face.vo.FaceNewAdminVo;
import com.accompany.business.model.face.vo.FaceTabNewVo;
import com.accompany.business.param.BasePageParams;
import com.accompany.common.result.PageResult;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.redisson.api.RBucket;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -31,4 +34,6 @@ public interface FaceTabNewService extends IService<FaceTabNew> {
List<FaceTabNew> tabList();
Map<Integer, String> tabNameMap();
}

27
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/face/impl/FaceNewServiceImpl.java
View File

@@ -2,23 +2,29 @@ package com.accompany.business.service.face.impl;
import com.accompany.business.constant.FaceConstant;
import com.accompany.business.model.face.FaceNew;
import com.accompany.business.model.face.vo.FaceNewAdminVo;
import com.accompany.business.model.face.vo.FaceNewVo;
import com.accompany.business.mybatismapper.face.FaceNewMapper;
import com.accompany.business.param.BasePageParams;
import com.accompany.business.service.face.FaceNewService;
import com.accompany.business.service.face.FaceTabNewService;
import com.accompany.common.result.PageResult;
import com.accompany.core.exception.AdminServiceException;
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.redisson.api.RedissonClient;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -33,9 +39,11 @@ public class FaceNewServiceImpl extends ServiceImpl<FaceNewMapper, FaceNew> impl
@Autowired
private RedissonClient redissonClient;
@Autowired
private FaceTabNewService faceTabNewService;
@Override
public IPage<FaceNew> listPage(Integer id, Integer tabId, Integer status, BasePageParams basePageParams) {
public PageResult<FaceNewAdminVo> listPage(Integer id, Integer tabId, Integer status, BasePageParams basePageParams) {
Page<FaceNew> page = new Page<>(basePageParams.getPageNo(),basePageParams.getPageSize());
LambdaQueryWrapper<FaceNew> queryWrapper = new LambdaQueryWrapper<>();
@@ -44,7 +52,22 @@ public class FaceNewServiceImpl extends ServiceImpl<FaceNewMapper, FaceNew> impl
.eq(status != null && status != -1, FaceNew::getStatus,status)
.orderByDesc(FaceNew::getSeqNo);
return this.page(page,queryWrapper);
Page<FaceNew> faceNewPage = this.page(page, queryWrapper);
PageResult<FaceNewAdminVo> faceNewPageResult = new PageResult<>();
faceNewPageResult.setTotal((int)faceNewPage.getTotal());
List<FaceNewAdminVo> faceNewAdminVos = new ArrayList<>();
faceNewPageResult.setRows(faceNewAdminVos);
List<FaceNew> rows = faceNewPage.getRecords();
if (CollectionUtils.isNotEmpty(rows)) {
Map<Integer, String> tabNameMap = faceTabNewService.tabNameMap();
for (FaceNew row : rows) {
FaceNewAdminVo faceNewAdminVo = new FaceNewAdminVo();
BeanUtils.copyProperties(row, faceNewAdminVo);
faceNewAdminVo.setTabName(tabNameMap.get(row.getTabId()));
faceNewAdminVos.add(faceNewAdminVo);
}
}
return faceNewPageResult;
}
@Override

20
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/face/impl/FaceTabNewServiceImpl.java
View File

@@ -1,12 +1,14 @@
package com.accompany.business.service.face.impl;
import com.accompany.business.model.face.FaceTabNew;
import com.accompany.business.model.face.vo.FaceNewAdminVo;
import com.accompany.business.model.face.vo.FaceNewVo;
import com.accompany.business.model.face.vo.FaceTabNewVo;
import com.accompany.business.mybatismapper.face.FaceTabNewMapper;
import com.accompany.business.param.BasePageParams;
import com.accompany.business.service.face.FaceNewService;
import com.accompany.business.service.face.FaceTabNewService;
import com.accompany.common.result.PageResult;
import com.accompany.core.exception.AdminServiceException;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -21,11 +23,10 @@ import org.redisson.client.codec.StringCodec;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.apache.commons.collections.CollectionUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
import static com.accompany.business.constant.FaceConstant.RedisKey.face_tab_new;
@@ -65,6 +66,15 @@ public class FaceTabNewServiceImpl extends ServiceImpl<FaceTabNewMapper, FaceTab
return this.list();
}
@Override
public Map<Integer, String> tabNameMap() {
List<FaceTabNew> faceTabNews = this.tabList();
if (CollectionUtils.isEmpty(faceTabNews)) {
return new HashMap<>();
}
return faceTabNews.stream().collect(Collectors.toMap(FaceTabNew::getId, x -> x.getTabName()));
}
private void existSeqNo(Integer seqNo) {
if (seqNo == null) {
return;
@@ -79,7 +89,7 @@ public class FaceTabNewServiceImpl extends ServiceImpl<FaceTabNewMapper, FaceTab
@Override
public void saveOrUpdage(FaceTabNew faceTabNew) {
;
if (faceTabNew.getId() == null) {
existSeqNo(faceTabNew.getTabSeq());
this.save(faceTabNew);