feat(REQ-2545): 扩展字段增加

tyr-api/src/main/java/cn/axzo/tyr/client/model/base/BaseFeatureResourceDO.java

@@ -43,4 +43,7 @@ public class BaseFeatureResourceDO {
 
     /** 组件元素的code列表 */
     private List<String> pageElementCodes;
+
+    /** 图片资源对象 **/
+    private FeatureResourceExtraDO extra;
 }

tyr-api/src/main/java/cn/axzo/tyr/client/model/base/FeatureResourceExtraDO.java

@@ -0,0 +1,30 @@
+package cn.axzo.tyr.client.model.base;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author likunpeng
+ * @version 1.0
+ * @date 2024/6/24
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FeatureResourceExtraDO implements Serializable {
+
+    /**
+     * 选中的图标
+     */
+    private String activeIcon;
+
+    /**
+     * 更多图标
+     */
+    private String moreIcon;
+}

tyr-api/src/main/java/cn/axzo/tyr/client/model/res/FeatureResourceDTO.java

@@ -1,5 +1,6 @@
 package cn.axzo.tyr.client.model.res;
 
+import cn.axzo.tyr.client.model.base.FeatureResourceExtraDO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -110,7 +111,7 @@ public class FeatureResourceDTO implements Serializable {
     /**
      * 扩展字段
      */
-    private String extra;
+    private FeatureResourceExtraDO extra;
 
     /**
      * 授权类型0-全部角色 1-指定角色

tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasFeatureResource.java

@@ -1,8 +1,11 @@
 package cn.axzo.tyr.server.repository.entity;
 
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
+import cn.axzo.tyr.client.model.base.FeatureResourceExtraDO;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -24,7 +27,7 @@ import java.util.stream.Collectors;
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("saas_feature_resource")
-public class SaasFeatureResource extends BaseEntity<SaasFeature> {
+public class SaasFeatureResource extends BaseEntity<SaasFeatureResource> {
 
     private static final long serialVersionUID = 1L;
 
@@ -129,7 +132,8 @@ public class SaasFeatureResource extends BaseEntity<SaasFeature> {
     /**
      * 扩展字段
      */
-    private String extra;
+    @TableField(value = "extra", typeHandler = FastjsonTypeHandler.class)
+    private FeatureResourceExtraDO extra;
 
     /**
      * 授权类型0-全部角色 1-指定角色

tyr-server/src/main/java/cn/axzo/tyr/server/service/ProductFeatureRelationService.java

@@ -22,6 +22,11 @@ public interface ProductFeatureRelationService {
 
     ApiResult<Boolean> updateFeatureRelation(List<ProductFeatureRelationUpdateReq> req);
 
+    /**
+     * 更新产品功能权限关系，仅支持saas_feature_resource功能点
+     *
+     * @param req
+     */
     void updateFeatureResourceRelation(List<ProductFeatureRelationUpdateReq> req);
 
     ApiResult<List<ProductFeatureRelationVO>> featureListByProduct(List<Long> productIds);