refactor: 重构仪表板配置DTO

src/main/java/com/syc/slm/slmbi/controller/DeptController.java

@@ -20,7 +20,7 @@ import java.util.List;
  **/
 @RequestMapping("/departments")
 @RestController
-@Api(value = "部门信息接口", description = "部门信息接口")
+@Api(value = "部门信息接口")
 public class DeptController {
 
     @Autowired

src/main/java/com/syc/slm/slmbi/dto/AccessType.java

+package com.syc.slm.slmbi.dto;
+
+/**
+ * 访问权限类型
+ * @author liangbin
+ * @date 2021/3/31
+ */
+public enum AccessType {
+
+    // 公开
+    PUBLIC,
+
+    // 私有
+    PRIVATE,
+
+    // 自定义
+    CUSTOM;
+}

src/main/java/com/syc/slm/slmbi/dto/CustomPermissionDTO.java

+package com.syc.slm.slmbi.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liangbin
+ * @date 2021/3/31
+ */
+@ApiModel(value = "自定义权限DTO")
+@Data
+public class CustomPermissionDTO {
+
+    @ApiModelProperty(value = "自定义权限类型", required = true)
+    private CustomPermissionType type;
+
+    @ApiModelProperty(value = "代表岗位、部门或个体用户id", required = true)
+    private String bizId;
+
+    @ApiModelProperty(value = "代表岗位，部门，个体用户名称")
+    private String bizName;
+
+}

src/main/java/com/syc/slm/slmbi/dto/CustomPermissionType.java

+package com.syc.slm.slmbi.dto;
+
+/**
+ * 自定义权限的类型
+ *
+ * @author liangbin
+ * @date 2021/3/31
+ */
+public enum CustomPermissionType {
+
+    //岗位
+    POSITION,
+
+    //部门
+    DEPARTMENT,
+
+    //用户
+    USER;
+}

src/main/java/com/syc/slm/slmbi/dto/InstrumentPanelConfigDTO.java

@@ -17,10 +17,15 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class InstrumentPanelConfigDTO {
     @ApiModelProperty(value = "仪表板id", required = true)
-    private String instrumentPanelId;
+    private String panelId;
+
+    @ApiModelProperty(value = "仪表板名称", required = true)
+    private String panelName;
+
     @ApiModelProperty(value = "仪表板配置详情，包含了样式，数据配置", required = true)
     private String configDetails;
+
     @ApiModelProperty(value = "访问权限", required = true)
-    private InstrumentPanelPermissionDTO visitPermission;
+    private InstrumentPanelPermissionDTO permission;
 
 }

src/main/java/com/syc/slm/slmbi/dto/InstrumentPanelPermissionDTO.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * slm-bi
  * 仪表板权限
@@ -13,26 +15,16 @@ import lombok.EqualsAndHashCode;
  * @date : 2021-03-25 19:05
  **/
 @Data
-@ApiModel(value = "仪表板权限DTO",description = "仪表板权限DTO")
-@EqualsAndHashCode(callSuper=false)
+@ApiModel(value = "仪表板权限DTO", description = "仪表板权限DTO")
+@EqualsAndHashCode(callSuper = false)
 public class InstrumentPanelPermissionDTO {
     @ApiModelProperty(value = "主键id")
     private String id;
-    @ApiModelProperty(value = "仪表板id",required = true)
-    private String instrumentPanelId;
-    @ApiModelProperty(value = "仪表板名称",required = true)
-    private String instrumentPanelName;
-    @ApiModelProperty(value = "仪表板分组id",required = true)
-    private String instrumentPanelGroupId;
-    @ApiModelProperty(value = "仪表板分组名称",required = true)
-    private String instrumentPanelGroupName;
 
+    @ApiModelProperty(value = "访问权限类型", required = true)
+    private AccessType type;
 
-    @ApiModelProperty(value = "存储类型，1代表岗位，2代表部门，3 代表个体用户",required = true)
-    private Integer permissionType;
-    @ApiModelProperty(value = "代表岗位1，部门2，个体用户id 3")
-    private String bizId;
-    @ApiModelProperty(value = "代表岗位，部门，个体用户名称")
-    private String bizName;
+    @ApiModelProperty(value = "自定义权限配置，当访问类型为CUSTOM时必填")
+    private List<CustomPermissionDTO> customPermissions;
 
 }

src/main/java/com/syc/slm/slmbi/entity/InstrumentPanelConfig.java

@@ -20,7 +20,7 @@ public class InstrumentPanelConfig extends BaseEntity<InstrumentPanelConfig>{
     @ApiModelProperty(value = "主键id")
     private String id ;
     @ApiModelProperty(value = "仪表板id")
-    private String instrumentPanelId;
+    private String panelId;
     @ApiModelProperty(value = "仪表板配置详情，包含了样式，数据配置")
     private String configDetails;
 }