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

多语言-房间标签新增地区ID

Browse Source
This commit is contained in:
liaozetao
2024-04-08 19:18:10 +08:00
committed by khalil
parent cf665c96ce
commit 1eb66e8e4e
8 changed files with 83 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/RoomTagAdminVo.java Normal file
View File

@@ -0,0 +1,14 @@
package com.accompany.admin.vo;
import com.accompany.business.model.RoomTag;
import com.accompany.core.annotation.I18nAdmin;
import lombok.Data;
import java.util.Date;
@Data
public class RoomTagAdminVo extends RoomTag {
private String partitionDesc;
}

0
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/roomtab/RoomTabAdminVo.java → accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/roomtab/RoomTabAdminVo.java
View File

8
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomSearchAdminService.java
View File

@@ -9,7 +9,6 @@ import com.accompany.admin.model.SingleBroadcastPopularityAdmin;
import com.accompany.admin.service.base.BaseService;
import com.accompany.admin.service.room.template.ResetRoomDealCache;
import com.accompany.admin.service.room.template.ResetRoomDealDb;
import com.accompany.admin.vo.RoomTagAdminVo;
import com.accompany.admin.vo.RoomVo;
import com.accompany.business.dto.SingleBroadcastCacheDto;
import com.accompany.business.model.Hall;
@@ -34,7 +33,6 @@ import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BlankUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.*;
import com.accompany.core.mybatismapper.RoomMapper;
@@ -66,7 +64,7 @@ public class RoomSearchAdminService extends BaseService {
@Autowired
private RoomService roomService;
@Autowired
private RoomTagService roomTagService;
private RoomTagAdminService roomTagAdminService;
@Autowired
private JedisService jedisService;
@Autowired
@@ -135,7 +133,7 @@ public class RoomSearchAdminService extends BaseService {
}
public List<RoomTag> getRoomTag(String name) {
List<RoomTag> roomTagList = roomTagService.getRoomTags(name);
List<RoomTag> roomTagList = roomTagAdminService.getRoomTags(name);
return roomTagList;
}
@@ -144,7 +142,7 @@ public class RoomSearchAdminService extends BaseService {
Boolean isPureMode, Boolean closeBox, Boolean hasKTVPriv, Boolean hasBlindDateRoomPri, Integer singleRoomSortId, Integer recommendStatus) throws Exception {
Room room = roomMapper.selectByPrimaryKey(Long.valueOf(uid));
if (room != null) {
RoomTag roomTag = roomTagService.getRoomTagById(tagId);
RoomTag roomTag = roomTagAdminService.getRoomTagById(tagId);
if (roomTag != null) {
room.setRoomTag(roomTag.getName());
room.setTagPict(roomTag.getPict());

51
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomTagService.java → accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomTagAdminService.java
View File

@@ -1,36 +1,45 @@
package com.accompany.admin.service.room;
import com.accompany.core.exception.ServiceException;
import cn.hutool.core.collection.CollectionUtil;
import com.accompany.admin.base.Pagination;
import com.accompany.admin.vo.RoomTagAdminVo;
import com.accompany.business.model.RoomTag;
import com.accompany.business.model.RoomTagExample;
import com.accompany.business.mybatismapper.RoomTagMapper;
import com.accompany.core.service.base.BaseService;
import com.accompany.core.util.StringUtils;
import com.google.common.collect.Maps;
import com.accompany.business.service.partition.PartitionInfoService;
import com.accompany.common.constant.Constant;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BlankUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.PartitionInfo;
import com.accompany.core.service.base.BaseService;
import com.accompany.core.util.StringUtils;
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;
import java.util.stream.Collectors;
@Service("roomTagService2")
public class RoomTagService extends BaseService {
public class RoomTagAdminService extends BaseService {
@Autowired
private RoomTagMapper roomTagMapper;
@Autowired
private PartitionInfoService partitionInfoService;
public RoomTag getRoomTagById(Integer tagId) {
RoomTag roomTag = roomTagMapper.selectByPrimaryKey(tagId);
RoomTag roomTag = roomTagMapper.selectByPrimaryKey(tagId);
return roomTag;
}
/**
*
* @param name
* @return
*/
@@ -60,7 +69,7 @@ public class RoomTagService extends BaseService {
public int saveRoomTag(RoomTag roomTag, boolean isEdit) {
if (isEdit) {
return updateRoomTag(roomTag);
}else {
} else {
roomTag.setCreateTime(new Date());
return insertRoomTag(roomTag);
}
@@ -74,7 +83,7 @@ public class RoomTagService extends BaseService {
roomTag.setCreateTime(new Date());
int result = this.insertRoomTag(roomTag);
//添加特殊标签的房间时，默认添加children为自身id
if(null != roomTag.getType() && Constant.RoomTagType.SPECIAL == roomTag.getType()) {
if (null != roomTag.getType() && Constant.RoomTagType.SPECIAL == roomTag.getType()) {
RoomTag updateTag = new RoomTag();
updateTag.setId(roomTag.getId());
updateTag.setChildren(String.valueOf(roomTag.getId()));
@@ -86,8 +95,8 @@ public class RoomTagService extends BaseService {
}
}
public Map<String, Object> getRoomTagList(String tagName, Byte showStatus, Date startTime, Date endTime, Integer type,
Integer page, Integer pageSize) {
public Pagination<RoomTagAdminVo> getRoomTagList(String tagName, Byte showStatus, Date startTime, Date endTime, Integer type,
Integer page, Integer pageSize) {
RoomTagExample example = new RoomTagExample();
example.setOffset((page - 1) * pageSize);
example.setLimit(pageSize);
@@ -115,9 +124,21 @@ public class RoomTagService extends BaseService {
}
int count = this.roomTagMapper.countByExample(example);
List<RoomTag> roomTagList = this.roomTagMapper.selectByExample(example);
Map<String, Object> data = Maps.newHashMap();
data.put("total", count);
data.put("rows", roomTagList);
return data;
List<RoomTagAdminVo> admins = new ArrayList<>();
Pagination<RoomTagAdminVo> pagination = new Pagination<>();
if (CollectionUtil.isNotEmpty(roomTagList)) {
Map<Integer, String> partitionInfoDescMap = partitionInfoService.listAll().stream().collect(Collectors.toMap(PartitionInfo::getId, PartitionInfo::getDesc));
for (RoomTag roomTag : roomTagList) {
RoomTagAdminVo admin = new RoomTagAdminVo();
BeanUtils.copyProperties(roomTag, admin);
if (CollectionUtil.isNotEmpty(partitionInfoDescMap)) {
admin.setPartitionDesc(partitionInfoDescMap.get(admin.getPartitionId()));
}
admins.add(admin);
}
}
pagination.setRows(admins);
pagination.setTotal(count);
return pagination;
}
}

147
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/RoomTagAdminVo.java
View File

@@ -1,147 +0,0 @@
package com.accompany.admin.vo;
import com.accompany.core.annotation.I18nAdmin;
import java.util.Date;
public class RoomTagAdminVo {
private Integer id;
@I18nAdmin(className = "RoomTag")
private String name;
@I18nAdmin(className = "RoomTag", fieldName = "name")
private String pict;
private Integer seq;
private Integer type;
private Boolean status;
private Boolean istop;
private Date createTime;
private String description;
private Integer tmpint;
private String tmpstr;
private String children;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
public String getPict() {
return pict;
}
public void setPict(String pict) {
this.pict = pict == null ? null : pict.trim();
}
public Integer getSeq() {
return seq;
}
public void setSeq(Integer seq) {
this.seq = seq;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public Boolean getStatus() {
return status;
}
public void setStatus(Boolean status) {
this.status = status;
}
public Boolean getIstop() {
return istop;
}
public void setIstop(Boolean istop) {
this.istop = istop;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description == null ? null : description.trim();
}
public Integer getTmpint() {
return tmpint;
}
public void setTmpint(Integer tmpint) {
this.tmpint = tmpint;
}
public String getTmpstr() {
return tmpstr;
}
public void setTmpstr(String tmpstr) {
this.tmpstr = tmpstr == null ? null : tmpstr.trim();
}
public String getChildren() {
return children;
}
public void setChildren(String children) {
this.children = children == null ? null : children.trim();
}
@Override
public String toString() {
return "RoomTag{" +
"id=" + id +
", name='" + name + '\'' +
", pict='" + pict + '\'' +
", seq=" + seq +
", type=" + type +
", status=" + status +
", istop=" + istop +
", createTime=" + createTime +
", description='" + description + '\'' +
", tmpint=" + tmpint +
", tmpstr='" + tmpstr + '\'' +
", children='" + children + '\'' +
'}';
}
}

4
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomTabAdminController.java
View File

@@ -3,8 +3,6 @@ package com.accompany.admin.controller.room;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.service.room.RoomTabAdminService;
import com.accompany.admin.vo.roomtab.RoomTabAdminVo;
import com.accompany.business.model.roomtab.RoomTab;
import com.accompany.business.service.roomtab.RoomTabService;
import com.accompany.core.exception.ServiceException;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
@@ -14,8 +12,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@Slf4j
@RestController
@RequestMapping("/admin/roomTab")

48
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomTagController.java → accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomTagAdminController.java
View File

@@ -1,29 +1,26 @@
package com.accompany.admin.controller.room;
import com.accompany.admin.base.Pagination;
import com.accompany.admin.vo.RoomTagAdminVo;
import com.alibaba.fastjson.JSON;
import com.accompany.admin.controller.BaseController;
import com.accompany.admin.service.room.RoomTagService;
import com.accompany.admin.service.room.RoomTagAdminService;
import com.accompany.core.exception.ServiceException;
import com.accompany.business.model.RoomTag;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Controller
@RestController
@RequestMapping("/admin/roomtag")
public class RoomTagController extends BaseController {
public class RoomTagAdminController extends BaseController {
@Autowired
private RoomTagService roomTagService2;
private RoomTagAdminService roomTagAdminService2;
@RequestMapping(value = "/getlist")
@@ -31,37 +28,30 @@ public class RoomTagController extends BaseController {
public BusiResult getRoomTagList(String name) {
BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS);
try {
busiResult.setData(roomTagService2.getRoomTags(name));
busiResult.setData(roomTagAdminService2.getRoomTags(name));
} catch (Exception e) {
logger.error("getRoomTagList error", e);
}
return busiResult;
}
@ResponseBody
@RequestMapping("/list")
public void getRoomTagList(String name, Byte status, Date startTime, Date endTime, Integer type,
@RequestParam(defaultValue = "1") Integer pageNum,
@RequestParam(defaultValue = "20") Integer pageSize) {
@GetMapping("/list")
public Pagination<RoomTagAdminVo> getRoomTagList(String name, Byte status, Date startTime, Date endTime, Integer type,
@RequestParam(defaultValue = "1") Integer pageNum,
@RequestParam(defaultValue = "20") Integer pageSize) {
logger.info("getTitleList(), name={}, status={}, startTime={}, endTime={}",
name, status, startTime, endTime);
try {
Map<String, Object> titleMap = this.roomTagService2.getRoomTagList(name, status, startTime, endTime, type, pageNum, pageSize);
writeJson(JSON.toJSONString(titleMap));
} catch (Exception e) {
writeJson(false, e.getMessage());
}
return this.roomTagAdminService2.getRoomTagList(name, status, startTime, endTime, type, pageNum, pageSize);
}
/**
*
* @param tagId
* @return
*/
@RequestMapping(value = "/get")
@ResponseBody
public void getById(Integer tagId) {
RoomTag roomTag = roomTagService2.getRoomTagById(tagId);
RoomTag roomTag = roomTagAdminService2.getRoomTagById(tagId);
writeJson(JSON.toJSONString(roomTag));
}
@@ -79,7 +69,7 @@ public class RoomTagController extends BaseController {
if (tagId == null) {
return new BusiResult(BusiStatus.PARAMETERILLEGAL);
}
busiResult.setData(roomTagService2.getRoomTagById(tagId));
busiResult.setData(roomTagAdminService2.getRoomTagById(tagId));
} catch (Exception e) {
logger.error("getRoomTagById error", e);
}
@@ -91,7 +81,7 @@ public class RoomTagController extends BaseController {
public BusiResult saveRoomTag(RoomTag roomTag, boolean isEdit) {
BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS);
try {
busiResult.setCode(roomTagService2.saveRoomTag(roomTag, isEdit));
busiResult.setCode(roomTagAdminService2.saveRoomTag(roomTag, isEdit));
} catch (Exception e) {
logger.error("saveRoomTag error", e);
}
@@ -102,7 +92,7 @@ public class RoomTagController extends BaseController {
@ResponseBody
public void save(RoomTag roomTag) {
logger.info("save roomTag={},adminId={}", JSON.toJSONString(roomTag), getAdminId());
roomTagService2.save(roomTag);
roomTagAdminService2.save(roomTag);
writeJson(true, "保存成功");
}
@@ -114,7 +104,7 @@ public class RoomTagController extends BaseController {
if (tagId == null) {
return new BusiResult(BusiStatus.PARAMETERILLEGAL);
}
busiResult.setData(roomTagService2.deleteRoomTag(tagId));
busiResult.setData(roomTagAdminService2.deleteRoomTag(tagId));
} catch (Exception e) {
logger.error("delRoomTag error", e);
}
@@ -126,7 +116,7 @@ public class RoomTagController extends BaseController {
public void del(Integer tagId) {
logger.info("del tagId={},adminId={}", tagId, getAdminId());
try {
roomTagService2.deleteRoomTag(tagId);
roomTagAdminService2.deleteRoomTag(tagId);
writeJson(true, "删除成功");
} catch (ServiceException e) {
writeJson(false, e.getBusiStatus().getMessage());

11
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RoomTag.java
View File

@@ -30,6 +30,8 @@ public class RoomTag {
private String children;
private Integer partitionId;
public Integer getId() {
return id;
}
@@ -126,6 +128,15 @@ public class RoomTag {
this.children = children == null ? null : children.trim();
}
public Integer getPartitionId() {
return partitionId;
}
public void setPartitionId(Integer partitionId) {
this.partitionId = partitionId;
}
@Override
public String toString() {
return "RoomTag{" +