Merge branch 'dev' of github.com:dataease/dataease into dev

backend/src/main/java/io/dataease/commons/model/BaseRspModel.java

@@ -0,0 +1,23 @@
+package io.dataease.commons.model;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class BaseRspModel implements Serializable {
+
+    @ApiModelProperty("成功标志")
+    private Boolean success = true;
+
+    @ApiModelProperty("请求ID")
+    private String requestId;
+
+    @ApiModelProperty("返回业务信息")
+    private Object responseInfo;
+
+
+}

backend/src/main/java/io/dataease/controller/ResultHolder.java

@@ -1,5 +1,6 @@
 package io.dataease.controller;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import springfox.documentation.annotations.ApiIgnore;
@@ -27,10 +28,13 @@ public class ResultHolder {
     }
 
     // 请求是否成功
+    @ApiModelProperty("请求是否成功")
     private boolean success = false;
     // 描述信息
+    @ApiModelProperty("描述信息")
     private String message;
     // 返回数据
+    @ApiModelProperty("返回数据")
     private Object data = "";
 
     public boolean isSuccess() {

backend/src/main/java/io/dataease/controller/panel/PanelDesignController.java

@@ -1,6 +1,7 @@
 package io.dataease.controller.panel;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.dataease.commons.model.BaseRspModel;
 import io.dataease.service.panel.PanelGroupService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,8 +25,9 @@ public class PanelDesignController {
 
     @ApiOperation("保存仪表板设计")
     @PostMapping("/saveDesign/{id}")
-    public void deleteCircle(@PathVariable String id) {
+    public BaseRspModel deleteCircle(@PathVariable String id) {
         panelGroupService.deleteCircle(id);
+        return new BaseRspModel();
     }
 
 

backend/src/main/java/io/dataease/controller/panel/PanelViewLinkageController.java

@@ -1,6 +1,7 @@
 package io.dataease.controller.panel;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.dataease.commons.model.BaseRspModel;
 import io.dataease.controller.request.panel.PanelLinkageRequest;
 import io.dataease.dto.PanelViewLinkageDTO;
 import io.dataease.service.panel.PanelViewLinkageService;
@@ -35,8 +36,9 @@ public class PanelViewLinkageController {
 
     @ApiOperation("保存仪表板视图联动信息")
     @PostMapping("/saveLinkage")
-    public void saveLinkage(@RequestBody PanelLinkageRequest request){
+    public BaseRspModel saveLinkage(@RequestBody PanelLinkageRequest request){
         panelViewLinkageService.saveLinkage(request);
+        return new BaseRspModel();
     }
 
 

backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java

@@ -21,7 +21,7 @@ import java.util.Map;
 public interface LinkApi {
 
 
-    @ApiOperation("重制密码")
+    @ApiOperation("重置密码")
     @PostMapping("/resetPwd")
     void replacePwd(PasswordRequest request);
 
@@ -29,7 +29,7 @@ public interface LinkApi {
     @PostMapping("/enablePwd")
     void enablePwd(EnablePwdRequest request);
 
-    @ApiOperation("切换开关")
+    @ApiOperation("启用/禁用链接分享")
     @PostMapping("/switchLink")
     void switchLink(LinkRequest request);
 

backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java

@@ -23,7 +23,6 @@ import java.util.List;
 public interface ShareApi {
 
     @ApiIgnore
-    @ApiOperation("创建分享")
     @PostMapping("/")
     void share(PanelShareRequest request);
 
@@ -37,8 +36,8 @@ public interface ShareApi {
     List<PanelShare> queryWithResourceId(BaseGridRequest request);
 
 
-    @ApiOperation("优化创建分享")
+    @ApiOperation("创建分享")
     @PostMapping("/fineSave")
     void fineSave(PanelShareFineDto panelShareFineDto);
-    
+
 }