|
@@ -4,12 +4,15 @@ import com.ruoyi.common.core.controller.BaseController;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
import com.ruoyi.common.exception.tenantdatassource.TenantDataSource;
|
|
|
+import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.system.entity.CommonEntity;
|
|
|
import com.ruoyi.system.entity.DragTable;
|
|
|
import com.ruoyi.system.entity.TableSql;
|
|
|
import com.ruoyi.system.service.ICommonService;
|
|
|
+import com.ruoyi.system.service.IDragTableGroupService;
|
|
|
import com.ruoyi.system.service.IDragTableService;
|
|
|
import com.ruoyi.system.service.ITableSqlService;
|
|
|
+import org.aspectj.weaver.loadtime.Aj;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
@@ -30,6 +33,9 @@ public class CommonController extends BaseController {
|
|
|
@Resource // 动态表格
|
|
|
private IDragTableService dragTableService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private IDragTableGroupService dragTableGroupService;
|
|
|
+
|
|
|
/**
|
|
|
* 共通查询
|
|
|
*/
|
|
@@ -76,14 +82,17 @@ public class CommonController extends BaseController {
|
|
|
return getDataTable(commonService.queryTableList(commonEntity, tableSql));
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 通用动态表单详情
|
|
|
*/
|
|
|
@GetMapping("/dragTableInfo")
|
|
|
public AjaxResult dragTableInfo(CommonEntity commonEntity) {
|
|
|
- //根据tableKey查询sqlKey
|
|
|
- return AjaxResult.success(dragTableService.dragTableInfo(commonEntity.getQueryMap().get("tableKey").toString()));
|
|
|
+ return AjaxResult.success(dragTableService.dragTableInfo(commonEntity.getQueryMap().get("tableKey").toString()));
|
|
|
+ }
|
|
|
+
|
|
|
+ @GetMapping("/dragGroupTableInfo")
|
|
|
+ public AjaxResult dragGroupTableInfo(CommonEntity commonEntity) {
|
|
|
+ return AjaxResult.success(dragTableGroupService.selectDragTableGroup(commonEntity.getQueryMap().get("groupKey").toString()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -94,6 +103,4 @@ public class CommonController extends BaseController {
|
|
|
startPage();
|
|
|
return getDataTable(commonService.dragTablePreview(commonEntity));
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|