From 58cb1ef74223d19f3866a0ebfa26f36c80df2131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Thu, 14 Aug 2025 11:43:39 +0800 Subject: [PATCH] 1 --- .../controller/jarvis/XbGroupController.java | 17 +++- .../java/com/ruoyi/jarvis/domain/XbGroup.java | 23 +++++ .../com/ruoyi/jarvis/enums/GroupType.java | 89 +++++++++++++++++++ .../java/com/ruoyi/jarvis/enums/IEnum.java | 14 +++ .../ruoyi/jarvis/enums/IEnumForString.java | 14 +++ .../resources/mapper/jarvis/XbGroupMapper.xml | 7 +- 6 files changed, 162 insertions(+), 2 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/jarvis/enums/GroupType.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/jarvis/enums/IEnum.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/jarvis/enums/IEnumForString.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/XbGroupController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/XbGroupController.java index 6a69d7e..7dfef58 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/XbGroupController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/XbGroupController.java @@ -3,6 +3,7 @@ package com.ruoyi.web.controller.jarvis; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.jarvis.enums.GroupType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -33,6 +34,11 @@ public class XbGroupController extends BaseController @Autowired private IXbGroupService xbGroupService; + @GetMapping("/select/groupType") + public AjaxResult getGroupTypeOptions() { + return AjaxResult.success(GroupType.getSelectItems()); + } + /** * 查询线报群信息列表 */ @@ -41,7 +47,16 @@ public class XbGroupController extends BaseController { startPage(); List list = xbGroupService.selectXbGroupList(xbGroup); - return getDataTable(list); + TableDataInfo dataTable = getDataTable(list); + if (!dataTable.getRows().isEmpty()) { + @SuppressWarnings("unchecked") + List rows = (List) dataTable.getRows(); + for (XbGroup xbGroupCache : rows) { + xbGroupCache.setGroupTypeName(GroupType.getName(xbGroup.getGroupType())); + } + } + + return dataTable; } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/XbGroup.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/XbGroup.java index e057cad..ffe8ef6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/XbGroup.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/XbGroup.java @@ -21,12 +21,26 @@ public class XbGroup /** 启用状态：0-禁用，1-启用 */ private Integer isActive; + /** 类型，1管理群，2评论群，3线报来源群，4线报推送群 */ + private Integer groupType; + + public String getGroupTypeName() { + return groupTypeName; + } + + public void setGroupTypeName(String groupTypeName) { + this.groupTypeName = groupTypeName; + } + + private String groupTypeName; + /** 创建时间 */ private Date createDate; /** 更新时间 */ private Date updateDate; + public Integer getId() { return id; } @@ -59,6 +73,14 @@ public class XbGroup this.isActive = isActive; } + public Integer getGroupType() { + return groupType; + } + + public void setGroupType(Integer groupType) { + this.groupType = groupType; + } + public Date getCreateDate() { return createDate; } @@ -82,6 +104,7 @@ public class XbGroup ", name='" + name + '\'' + ", wxid='" + wxid + '\'' + ", isActive=" + isActive + + ", groupType=" + groupType + ", createDate=" + createDate + ", updateDate=" + updateDate + '}'; diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/enums/GroupType.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/enums/GroupType.java new file mode 100644 index 0000000..8f95aae --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/enums/GroupType.java @@ -0,0 +1,89 @@ +package com.ruoyi.jarvis.enums; + +/** + * @author Leo + * @version 1.0 + * @create 2023/12/19 0019 上午 10:27 + * @description： + */ + +import com.fasterxml.jackson.annotation.JsonValue; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public enum GroupType implements IEnum { + + /** + * 类型，1管理群，2评论群，3线报来源群，4线报推送群 + * */ + MANAGEMENT(1, "管理群"), + COMMENT(2, "评论群"), + LINE_REPORT_SOURCE(3, "线报来源群"), + LINE_REPORT_PUSH(4, "线报推送群"); + private final int key; + + private final String name; + + GroupType(int key, String name) { + this.key = key; + this.name = name; + } + + public static GroupType get(int key) { + for (GroupType e : GroupType.values()) { + if (e.getKey() == key) { + return e; + } + } + return null; + } + + public static String getName(Integer key) { + //if (Object.isNotEmpty(key)) { + GroupType[] items = GroupType.values(); + for (GroupType item : items) { + if (item.getKey() == key) { + return item.getName(); + } + } + //} + return ""; + } + + public static Map getKeyVlue() { + Map map = new HashMap<>(); + GroupType[] items = GroupType.values(); + for (GroupType item : items) { + map.put(item.getKey() + "", item.getName()); + } + return map; + } + + public static List> getSelectItems() { + List> result = new ArrayList>(); + GroupType[] items = GroupType.values(); + for (GroupType item : items) { + Map map = new HashMap<>(); + map.put("label", item.getName()); + map.put("value", item.getKey()); + result.add(map); + } + return result; + } + + @Override + @JsonValue + public Integer getKey() { + return key; + } + + @Override + public String getName() { + return name; + } + +} + diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/enums/IEnum.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/enums/IEnum.java new file mode 100644 index 0000000..63d05c5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/enums/IEnum.java @@ -0,0 +1,14 @@ +package com.ruoyi.jarvis.enums; + +/** + * @author Leo + * @version 1.0 + * @create 2023/12/19 0019 上午 10:33 + * @description： + */ +public interface IEnum { + + Integer getKey(); + + String getName(); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/enums/IEnumForString.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/enums/IEnumForString.java new file mode 100644 index 0000000..6900472 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/enums/IEnumForString.java @@ -0,0 +1,14 @@ +package com.ruoyi.jarvis.enums; + +/** + * @author Leo + * @version 1.0 + * @create 2023/12/19 0019 上午 10:33 + * @description： + */ +public interface IEnumForString { + + String getKey(); + + String getName(); +} diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/XbGroupMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/XbGroupMapper.xml index 6751331..dddae7e 100644 --- a/ruoyi-system/src/main/resources/mapper/jarvis/XbGroupMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/jarvis/XbGroupMapper.xml @@ -9,12 +9,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, name, wxid, is_active, create_date, update_date from xb_group + select id, name, wxid, is_active, group_type, create_date, update_date from xb_group