提交 b3c63dda authored 作者: fit2cloud-chenyw's avatar fit2cloud-chenyw

feat: 补齐api

上级 81ee2455
package io.dataease.auth.api; package io.dataease.auth.api;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.auth.api.dto.CurrentUserDto;
import io.dataease.auth.api.dto.LoginDto; import io.dataease.auth.api.dto.LoginDto;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -12,6 +13,7 @@ import java.util.Map; ...@@ -12,6 +13,7 @@ import java.util.Map;
@Api(tags = "权限:权限管理") @Api(tags = "权限:权限管理")
@ApiSupport(order = 10)
@RequestMapping("/api/auth") @RequestMapping("/api/auth")
public interface AuthApi { public interface AuthApi {
......
package io.dataease.auth.api; package io.dataease.auth.api;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.auth.api.dto.DynamicMenuDto; import io.dataease.auth.api.dto.DynamicMenuDto;
import io.dataease.controller.handler.annotation.I18n; import io.dataease.controller.handler.annotation.I18n;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import java.util.List; import java.util.List;
@Api(tags = "权限:动态菜单") @Api(tags = "权限:动态菜单")
@ApiSupport(order = 20)
@RequestMapping("/api/dynamicMenu") @RequestMapping("/api/dynamicMenu")
public interface DynamicMenuApi { public interface DynamicMenuApi {
...@@ -16,6 +19,7 @@ public interface DynamicMenuApi { ...@@ -16,6 +19,7 @@ public interface DynamicMenuApi {
* 根据heads中获取的token 获取username 获取对应权限的菜单 * 根据heads中获取的token 获取username 获取对应权限的菜单
* @return * @return
*/ */
@ApiOperation("查询")
@PostMapping("/menus") @PostMapping("/menus")
@I18n @I18n
List<DynamicMenuDto> menus(); List<DynamicMenuDto> menus();
......
...@@ -2,7 +2,7 @@ package io.dataease.base.mapper.ext; ...@@ -2,7 +2,7 @@ package io.dataease.base.mapper.ext;
import io.dataease.base.domain.SysMsgExample; import io.dataease.base.domain.SysMsgExample;
import io.dataease.base.domain.SysMsgSetting; import io.dataease.base.domain.SysMsgSetting;
import io.dataease.controller.message.dto.MsgGridDto; import io.dataease.controller.sys.response.MsgGridDto;
import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.dataease.base.mapper.ext.ExtSysMsgMapper"> <mapper namespace="io.dataease.base.mapper.ext.ExtSysMsgMapper">
<resultMap id="msgGridDto" type="io.dataease.controller.message.dto.MsgGridDto" extends="io.dataease.base.mapper.SysMsgMapper.BaseResultMap"> <resultMap id="msgGridDto" type="io.dataease.controller.sys.response.MsgGridDto" extends="io.dataease.base.mapper.SysMsgMapper.BaseResultMap">
<result column="router" property="router"></result> <result column="router" property="router"></result>
<result column="callback" property="callback"></result> <result column="callback" property="callback"></result>
</resultMap> </resultMap>
......
package io.dataease.controller.chart; package io.dataease.controller.chart;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.controller.request.dataset.DataSetTableRequest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@Api(tags = "视图:视图管理")
@ApiSupport(order = 110)
@RestController @RestController
@RequestMapping("chart/table") @RequestMapping("chart/table")
public class ChartController { public class ChartController {
@ApiOperation("查询")
@PostMapping("list") @PostMapping("list")
public List<JSON> list(@RequestBody DataSetTableRequest dataSetTableRequest) { public List<JSON> list(@RequestBody DataSetTableRequest dataSetTableRequest) {
return new ArrayList<>(); return new ArrayList<>();
......
package io.dataease.controller.chart; package io.dataease.controller.chart;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.ChartGroup; import io.dataease.base.domain.ChartGroup;
import io.dataease.controller.request.chart.ChartGroupRequest; import io.dataease.controller.request.chart.ChartGroupRequest;
import io.dataease.dto.chart.ChartGroupDTO; import io.dataease.dto.chart.ChartGroupDTO;
import io.dataease.service.chart.ChartGroupService; import io.dataease.service.chart.ChartGroupService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
@Api(tags = "视图:视图组")
@ApiSupport(order = 120)
@RestController @RestController
@RequestMapping("chart/group") @RequestMapping("chart/group")
public class ChartGroupController { public class ChartGroupController {
@Resource @Resource
private ChartGroupService chartGroupService; private ChartGroupService chartGroupService;
@ApiOperation("保存")
@PostMapping("/save") @PostMapping("/save")
public ChartGroupDTO save(@RequestBody ChartGroup ChartGroup) { public ChartGroupDTO save(@RequestBody ChartGroup ChartGroup) {
return chartGroupService.save(ChartGroup); return chartGroupService.save(ChartGroup);
} }
@ApiOperation("查询树")
@PostMapping("/tree") @PostMapping("/tree")
public List<ChartGroupDTO> tree(@RequestBody ChartGroupRequest ChartGroup) { public List<ChartGroupDTO> tree(@RequestBody ChartGroupRequest ChartGroup) {
return chartGroupService.tree(ChartGroup); return chartGroupService.tree(ChartGroup);
} }
@ApiOperation("查询树节点")
@PostMapping("/treeNode") @PostMapping("/treeNode")
public List<ChartGroupDTO> treeNode(@RequestBody ChartGroupRequest ChartGroup) { public List<ChartGroupDTO> treeNode(@RequestBody ChartGroupRequest ChartGroup) {
return chartGroupService.tree(ChartGroup); return chartGroupService.tree(ChartGroup);
} }
@ApiOperation("删除")
@PostMapping("/delete/{id}") @PostMapping("/delete/{id}")
public void tree(@PathVariable String id) { public void tree(@PathVariable String id) {
chartGroupService.delete(id); chartGroupService.delete(id);
} }
@ApiIgnore
@PostMapping("/getScene/{id}") @PostMapping("/getScene/{id}")
public ChartGroup getScene(@PathVariable String id) { public ChartGroup getScene(@PathVariable String id) {
return chartGroupService.getScene(id); return chartGroupService.getScene(id);
......
package io.dataease.controller.chart; package io.dataease.controller.chart;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.ChartViewWithBLOBs; import io.dataease.base.domain.ChartViewWithBLOBs;
import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.AuthUtils;
import io.dataease.controller.request.chart.ChartExtRequest; import io.dataease.controller.request.chart.ChartExtRequest;
...@@ -8,7 +9,10 @@ import io.dataease.controller.request.dataset.DataSetTableRequest; ...@@ -8,7 +9,10 @@ import io.dataease.controller.request.dataset.DataSetTableRequest;
import io.dataease.dto.chart.ChartViewDTO; import io.dataease.dto.chart.ChartViewDTO;
import io.dataease.dto.dataset.DataSetTableDTO; import io.dataease.dto.dataset.DataSetTableDTO;
import io.dataease.service.chart.ChartViewService; import io.dataease.service.chart.ChartViewService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
...@@ -18,57 +22,69 @@ import java.util.Map; ...@@ -18,57 +22,69 @@ import java.util.Map;
* @Author gin * @Author gin
* @Date 2021/3/1 1:17 下午 * @Date 2021/3/1 1:17 下午
*/ */
@Api(tags = "视图:视图域")
@ApiSupport(order = 130)
@RestController @RestController
@RequestMapping("/chart/view") @RequestMapping("/chart/view")
public class ChartViewController { public class ChartViewController {
@Resource @Resource
private ChartViewService chartViewService; private ChartViewService chartViewService;
@ApiOperation("保存")
@PostMapping("/save") @PostMapping("/save")
public ChartViewWithBLOBs save(@RequestBody ChartViewWithBLOBs chartViewWithBLOBs) { public ChartViewWithBLOBs save(@RequestBody ChartViewWithBLOBs chartViewWithBLOBs) {
return chartViewService.save(chartViewWithBLOBs); return chartViewService.save(chartViewWithBLOBs);
} }
@ApiOperation("查询")
@PostMapping("/list") @PostMapping("/list")
public List<ChartViewDTO> list(@RequestBody ChartViewRequest chartViewRequest) { public List<ChartViewDTO> list(@RequestBody ChartViewRequest chartViewRequest) {
return chartViewService.list(chartViewRequest); return chartViewService.list(chartViewRequest);
} }
@ApiOperation("查询组")
@PostMapping("/listAndGroup") @PostMapping("/listAndGroup")
public List<ChartViewDTO> listAndGroup(@RequestBody ChartViewRequest chartViewRequest) { public List<ChartViewDTO> listAndGroup(@RequestBody ChartViewRequest chartViewRequest) {
return chartViewService.listAndGroup(chartViewRequest); return chartViewService.listAndGroup(chartViewRequest);
} }
@ApiOperation("详息")
@PostMapping("/get/{id}") @PostMapping("/get/{id}")
public ChartViewWithBLOBs get(@PathVariable String id) { public ChartViewWithBLOBs get(@PathVariable String id) {
return chartViewService.get(id); return chartViewService.get(id);
} }
@ApiOperation("删除")
@PostMapping("/delete/{id}") @PostMapping("/delete/{id}")
public void delete(@PathVariable String id) { public void delete(@PathVariable String id) {
chartViewService.delete(id); chartViewService.delete(id);
} }
@ApiOperation("数据")
@PostMapping("/getData/{id}") @PostMapping("/getData/{id}")
public ChartViewDTO getData(@PathVariable String id, @RequestBody ChartExtRequest requestList) throws Exception { public ChartViewDTO getData(@PathVariable String id, @RequestBody ChartExtRequest requestList) throws Exception {
return chartViewService.getData(id, requestList); return chartViewService.getData(id, requestList);
} }
@ApiOperation("视图详情")
@PostMapping("chartDetail/{id}") @PostMapping("chartDetail/{id}")
public Map<String, Object> chartDetail(@PathVariable String id) { public Map<String, Object> chartDetail(@PathVariable String id) {
return chartViewService.getChartDetail(id); return chartViewService.getChartDetail(id);
} }
@ApiOperation("复制")
@PostMapping("chartCopy/{id}") @PostMapping("chartCopy/{id}")
public String chartCopy(@PathVariable String id) { public String chartCopy(@PathVariable String id) {
return chartViewService.chartCopy(id); return chartViewService.chartCopy(id);
} }
@ApiIgnore
@GetMapping("searchAdviceSceneId/{panelId}") @GetMapping("searchAdviceSceneId/{panelId}")
public String searchAdviceSceneId(@PathVariable String panelId) { public String searchAdviceSceneId(@PathVariable String panelId) {
return chartViewService.searchAdviceSceneId(panelId); return chartViewService.searchAdviceSceneId(panelId);
} }
@ApiOperation("根据权限查详情")
@PostMapping("/getOneWithPermission/{id}") @PostMapping("/getOneWithPermission/{id}")
public ChartViewDTO getOneWithPermission(@PathVariable String id, @RequestBody ChartExtRequest requestList) throws Exception { public ChartViewDTO getOneWithPermission(@PathVariable String id, @RequestBody ChartExtRequest requestList) throws Exception {
//如果能获取用户 则添加对应的权限 //如果能获取用户 则添加对应的权限
...@@ -80,7 +96,7 @@ public class ChartViewController { ...@@ -80,7 +96,7 @@ public class ChartViewController {
return dto; return dto;
} }
@ApiOperation("搜索")
@PostMapping("search") @PostMapping("search")
public List<ChartViewDTO> search(@RequestBody ChartViewRequest chartViewRequest) { public List<ChartViewDTO> search(@RequestBody ChartViewRequest chartViewRequest) {
return chartViewService.search(chartViewRequest); return chartViewService.search(chartViewRequest);
......
package io.dataease.controller.dataset; package io.dataease.controller.dataset;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.DatasetGroup; import io.dataease.base.domain.DatasetGroup;
import io.dataease.controller.request.dataset.DataSetGroupRequest; import io.dataease.controller.request.dataset.DataSetGroupRequest;
import io.dataease.dto.dataset.DataSetGroupDTO; import io.dataease.dto.dataset.DataSetGroupDTO;
import io.dataease.service.dataset.DataSetGroupService; import io.dataease.service.dataset.DataSetGroupService;
import io.dataease.service.dataset.ExtractDataService; import io.dataease.service.dataset.ExtractDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
...@@ -14,6 +18,8 @@ import java.util.List; ...@@ -14,6 +18,8 @@ import java.util.List;
* @Author gin * @Author gin
* @Date 2021/2/20 8:29 下午 * @Date 2021/2/20 8:29 下午
*/ */
@Api(tags = "数据集:数据集组")
@ApiSupport(order = 40)
@RestController @RestController
@RequestMapping("dataset/group") @RequestMapping("dataset/group")
public class DataSetGroupController { public class DataSetGroupController {
...@@ -22,31 +28,37 @@ public class DataSetGroupController { ...@@ -22,31 +28,37 @@ public class DataSetGroupController {
@Resource @Resource
private ExtractDataService extractDataService; private ExtractDataService extractDataService;
@ApiOperation("保存")
@PostMapping("/save") @PostMapping("/save")
public DataSetGroupDTO save(@RequestBody DatasetGroup datasetGroup) { public DataSetGroupDTO save(@RequestBody DatasetGroup datasetGroup) {
return dataSetGroupService.save(datasetGroup); return dataSetGroupService.save(datasetGroup);
} }
@ApiOperation("查询树")
@PostMapping("/tree") @PostMapping("/tree")
public List<DataSetGroupDTO> tree(@RequestBody DataSetGroupRequest datasetGroup) { public List<DataSetGroupDTO> tree(@RequestBody DataSetGroupRequest datasetGroup) {
return dataSetGroupService.tree(datasetGroup); return dataSetGroupService.tree(datasetGroup);
} }
@ApiOperation("查询树节点")
@PostMapping("/treeNode") @PostMapping("/treeNode")
public List<DataSetGroupDTO> treeNode(@RequestBody DataSetGroupRequest datasetGroup) { public List<DataSetGroupDTO> treeNode(@RequestBody DataSetGroupRequest datasetGroup) {
return dataSetGroupService.treeNode(datasetGroup); return dataSetGroupService.treeNode(datasetGroup);
} }
@ApiOperation("删除")
@PostMapping("/delete/{id}") @PostMapping("/delete/{id}")
public void tree(@PathVariable String id) throws Exception { public void tree(@PathVariable String id) throws Exception {
dataSetGroupService.delete(id); dataSetGroupService.delete(id);
} }
@ApiIgnore
@PostMapping("/getScene/{id}") @PostMapping("/getScene/{id}")
public DatasetGroup getScene(@PathVariable String id) { public DatasetGroup getScene(@PathVariable String id) {
return dataSetGroupService.getScene(id); return dataSetGroupService.getScene(id);
} }
@ApiOperation("检测kettle")
@PostMapping("/isKettleRunning") @PostMapping("/isKettleRunning")
public boolean isKettleRunning() { public boolean isKettleRunning() {
return extractDataService.isKettleRunning(); return extractDataService.isKettleRunning();
......
package io.dataease.controller.dataset; package io.dataease.controller.dataset;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.DatasetTable; import io.dataease.base.domain.DatasetTable;
import io.dataease.base.domain.DatasetTableField; import io.dataease.base.domain.DatasetTableField;
import io.dataease.base.domain.DatasetTableIncrementalConfig; import io.dataease.base.domain.DatasetTableIncrementalConfig;
...@@ -7,6 +8,8 @@ import io.dataease.controller.request.dataset.DataSetTableRequest; ...@@ -7,6 +8,8 @@ import io.dataease.controller.request.dataset.DataSetTableRequest;
import io.dataease.datasource.dto.TableFiled; import io.dataease.datasource.dto.TableFiled;
import io.dataease.dto.dataset.DataSetTableDTO; import io.dataease.dto.dataset.DataSetTableDTO;
import io.dataease.service.dataset.DataSetTableService; import io.dataease.service.dataset.DataSetTableService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -18,97 +21,117 @@ import java.util.Map; ...@@ -18,97 +21,117 @@ import java.util.Map;
* @Author gin * @Author gin
* @Date 2021/2/20 8:29 下午 * @Date 2021/2/20 8:29 下午
*/ */
@Api(tags = "数据集:数据集表")
@ApiSupport(order = 50)
@RestController @RestController
@RequestMapping("dataset/table") @RequestMapping("dataset/table")
public class DataSetTableController { public class DataSetTableController {
@Resource @Resource
private DataSetTableService dataSetTableService; private DataSetTableService dataSetTableService;
@ApiOperation("批量保存")
@PostMapping("batchAdd") @PostMapping("batchAdd")
public void batchAdd(@RequestBody List<DataSetTableRequest> datasetTable) throws Exception { public void batchAdd(@RequestBody List<DataSetTableRequest> datasetTable) throws Exception {
dataSetTableService.batchInsert(datasetTable); dataSetTableService.batchInsert(datasetTable);
} }
@ApiOperation("更新")
@PostMapping("update") @PostMapping("update")
public DatasetTable save(@RequestBody DataSetTableRequest datasetTable) throws Exception { public DatasetTable save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
return dataSetTableService.save(datasetTable); return dataSetTableService.save(datasetTable);
} }
@ApiOperation("删除")
@PostMapping("delete/{id}") @PostMapping("delete/{id}")
public void delete(@PathVariable String id) throws Exception { public void delete(@PathVariable String id) throws Exception {
dataSetTableService.delete(id); dataSetTableService.delete(id);
} }
@ApiOperation("查询")
@PostMapping("list") @PostMapping("list")
public List<DataSetTableDTO> list(@RequestBody DataSetTableRequest dataSetTableRequest) { public List<DataSetTableDTO> list(@RequestBody DataSetTableRequest dataSetTableRequest) {
return dataSetTableService.list(dataSetTableRequest); return dataSetTableService.list(dataSetTableRequest);
} }
@ApiOperation("查询组")
@PostMapping("listAndGroup") @PostMapping("listAndGroup")
public List<DataSetTableDTO> listAndGroup(@RequestBody DataSetTableRequest dataSetTableRequest) { public List<DataSetTableDTO> listAndGroup(@RequestBody DataSetTableRequest dataSetTableRequest) {
return dataSetTableService.listAndGroup(dataSetTableRequest); return dataSetTableService.listAndGroup(dataSetTableRequest);
} }
@ApiOperation("详息")
@PostMapping("get/{id}") @PostMapping("get/{id}")
public DatasetTable get(@PathVariable String id) { public DatasetTable get(@PathVariable String id) {
return dataSetTableService.get(id); return dataSetTableService.get(id);
} }
@ApiOperation("带权限查询")
@PostMapping("getWithPermission/{id}") @PostMapping("getWithPermission/{id}")
public DataSetTableDTO getWithPermission(@PathVariable String id) { public DataSetTableDTO getWithPermission(@PathVariable String id) {
return dataSetTableService.getWithPermission(id); return dataSetTableService.getWithPermission(id);
} }
@ApiOperation("查询原始字段")
@PostMapping("getFields") @PostMapping("getFields")
public List<TableFiled> getFields(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception { public List<TableFiled> getFields(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception {
return dataSetTableService.getFields(dataSetTableRequest); return dataSetTableService.getFields(dataSetTableRequest);
} }
@ApiOperation("查询生成字段")
@PostMapping("getFieldsFromDE") @PostMapping("getFieldsFromDE")
public Map<String, List<DatasetTableField>> getFieldsFromDE(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception { public Map<String, List<DatasetTableField>> getFieldsFromDE(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception {
return dataSetTableService.getFieldsFromDE(dataSetTableRequest); return dataSetTableService.getFieldsFromDE(dataSetTableRequest);
} }
@ApiOperation("查询预览数据")
@PostMapping("getPreviewData/{page}/{pageSize}") @PostMapping("getPreviewData/{page}/{pageSize}")
public Map<String, Object> getPreviewData(@RequestBody DataSetTableRequest dataSetTableRequest, @PathVariable Integer page, @PathVariable Integer pageSize) throws Exception { public Map<String, Object> getPreviewData(@RequestBody DataSetTableRequest dataSetTableRequest, @PathVariable Integer page, @PathVariable Integer pageSize) throws Exception {
return dataSetTableService.getPreviewData(dataSetTableRequest, page, pageSize); return dataSetTableService.getPreviewData(dataSetTableRequest, page, pageSize);
} }
@ApiOperation("根据sql查询预览数据")
@PostMapping("sqlPreview") @PostMapping("sqlPreview")
public Map<String, Object> getSQLPreview(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception { public Map<String, Object> getSQLPreview(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception {
return dataSetTableService.getSQLPreview(dataSetTableRequest); return dataSetTableService.getSQLPreview(dataSetTableRequest);
} }
@ApiOperation("客户预览数据")
@PostMapping("customPreview") @PostMapping("customPreview")
public Map<String, Object> customPreview(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception { public Map<String, Object> customPreview(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception {
return dataSetTableService.getCustomPreview(dataSetTableRequest); return dataSetTableService.getCustomPreview(dataSetTableRequest);
} }
@ApiOperation("查询增量配置")
@PostMapping("incrementalConfig") @PostMapping("incrementalConfig")
public DatasetTableIncrementalConfig incrementalConfig(@RequestBody DatasetTableIncrementalConfig datasetTableIncrementalConfig) throws Exception { public DatasetTableIncrementalConfig incrementalConfig(@RequestBody DatasetTableIncrementalConfig datasetTableIncrementalConfig) throws Exception {
return dataSetTableService.incrementalConfig(datasetTableIncrementalConfig); return dataSetTableService.incrementalConfig(datasetTableIncrementalConfig);
} }
@ApiOperation("保存增量配置")
@PostMapping("save/incrementalConfig") @PostMapping("save/incrementalConfig")
public void saveIncrementalConfig(@RequestBody DatasetTableIncrementalConfig datasetTableIncrementalConfig) throws Exception { public void saveIncrementalConfig(@RequestBody DatasetTableIncrementalConfig datasetTableIncrementalConfig) throws Exception {
dataSetTableService.saveIncrementalConfig(datasetTableIncrementalConfig); dataSetTableService.saveIncrementalConfig(datasetTableIncrementalConfig);
} }
@ApiOperation("数据集详息")
@PostMapping("datasetDetail/{id}") @PostMapping("datasetDetail/{id}")
public Map<String, Object> datasetDetail(@PathVariable String id) { public Map<String, Object> datasetDetail(@PathVariable String id) {
return dataSetTableService.getDatasetDetail(id); return dataSetTableService.getDatasetDetail(id);
} }
@ApiOperation("excel上传")
@PostMapping("excel/upload") @PostMapping("excel/upload")
public Map<String, Object> excelUpload(@RequestParam("file") MultipartFile file, @RequestParam("tableId") String tableId) throws Exception { public Map<String, Object> excelUpload(@RequestParam("file") MultipartFile file, @RequestParam("tableId") String tableId) throws Exception {
return dataSetTableService.excelSaveAndParse(file, tableId); return dataSetTableService.excelSaveAndParse(file, tableId);
} }
@ApiOperation("检测doris")
@PostMapping("checkDorisTableIsExists/{id}") @PostMapping("checkDorisTableIsExists/{id}")
public Boolean checkDorisTableIsExists(@PathVariable String id) throws Exception { public Boolean checkDorisTableIsExists(@PathVariable String id) throws Exception {
return dataSetTableService.checkDorisTableIsExists(id); return dataSetTableService.checkDorisTableIsExists(id);
} }
@ApiOperation("搜索")
@PostMapping("search") @PostMapping("search")
public List<DataSetTableDTO> search(@RequestBody DataSetTableRequest dataSetTableRequest) { public List<DataSetTableDTO> search(@RequestBody DataSetTableRequest dataSetTableRequest) {
return dataSetTableService.search(dataSetTableRequest); return dataSetTableService.search(dataSetTableRequest);
......
package io.dataease.controller.dataset; package io.dataease.controller.dataset;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.DatasetTableField; import io.dataease.base.domain.DatasetTableField;
import io.dataease.service.dataset.DataSetFieldService; import io.dataease.service.dataset.DataSetFieldService;
import io.dataease.service.dataset.DataSetTableFieldsService; import io.dataease.service.dataset.DataSetTableFieldsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -15,6 +18,8 @@ import java.util.Map; ...@@ -15,6 +18,8 @@ import java.util.Map;
* @Author gin * @Author gin
* @Date 2021/2/24 4:28 下午 * @Date 2021/2/24 4:28 下午
*/ */
@Api(tags = "数据集:数据集字段")
@ApiSupport(order = 60)
@RestController @RestController
@RequestMapping("/dataset/field") @RequestMapping("/dataset/field")
public class DataSetTableFieldController { public class DataSetTableFieldController {
...@@ -24,6 +29,7 @@ public class DataSetTableFieldController { ...@@ -24,6 +29,7 @@ public class DataSetTableFieldController {
@Autowired @Autowired
private DataSetFieldService dataSetFieldService; private DataSetFieldService dataSetFieldService;
@ApiOperation("查询表下属字段")
@PostMapping("list/{tableId}") @PostMapping("list/{tableId}")
public List<DatasetTableField> list(@PathVariable String tableId) { public List<DatasetTableField> list(@PathVariable String tableId) {
DatasetTableField datasetTableField = DatasetTableField.builder().build(); DatasetTableField datasetTableField = DatasetTableField.builder().build();
...@@ -31,6 +37,7 @@ public class DataSetTableFieldController { ...@@ -31,6 +37,7 @@ public class DataSetTableFieldController {
return dataSetTableFieldsService.list(datasetTableField); return dataSetTableFieldsService.list(datasetTableField);
} }
@ApiOperation("分组查询表下属字段")
@PostMapping("listByDQ/{tableId}") @PostMapping("listByDQ/{tableId}")
public Map<String, List<DatasetTableField>> listByDQ(@PathVariable String tableId) { public Map<String, List<DatasetTableField>> listByDQ(@PathVariable String tableId) {
DatasetTableField datasetTableField = DatasetTableField.builder().build(); DatasetTableField datasetTableField = DatasetTableField.builder().build();
...@@ -46,21 +53,24 @@ public class DataSetTableFieldController { ...@@ -46,21 +53,24 @@ public class DataSetTableFieldController {
return map; return map;
} }
@ApiOperation("批量更新")
@PostMapping("batchEdit") @PostMapping("batchEdit")
public void batchEdit(@RequestBody List<DatasetTableField> list) { public void batchEdit(@RequestBody List<DatasetTableField> list) {
dataSetTableFieldsService.batchEdit(list); dataSetTableFieldsService.batchEdit(list);
} }
@ApiOperation("保存")
@PostMapping("save") @PostMapping("save")
public DatasetTableField save(@RequestBody DatasetTableField datasetTableField) { public DatasetTableField save(@RequestBody DatasetTableField datasetTableField) {
return dataSetTableFieldsService.save(datasetTableField); return dataSetTableFieldsService.save(datasetTableField);
} }
@ApiOperation("删除")
@PostMapping("delete/{id}") @PostMapping("delete/{id}")
public void delete(@PathVariable String id) { public void delete(@PathVariable String id) {
dataSetTableFieldsService.delete(id); dataSetTableFieldsService.delete(id);
} }
@ApiOperation("值枚举")
@PostMapping("fieldValues/{fieldId}") @PostMapping("fieldValues/{fieldId}")
public List<Object> fieldValues(@PathVariable String fieldId) { public List<Object> fieldValues(@PathVariable String fieldId) {
return dataSetFieldService.fieldValues(fieldId); return dataSetFieldService.fieldValues(fieldId);
......
...@@ -2,6 +2,7 @@ package io.dataease.controller.dataset; ...@@ -2,6 +2,7 @@ package io.dataease.controller.dataset;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.DatasetTableTask; import io.dataease.base.domain.DatasetTableTask;
import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.PageUtils;
import io.dataease.commons.utils.Pager; import io.dataease.commons.utils.Pager;
...@@ -10,6 +11,7 @@ import io.dataease.controller.sys.base.BaseGridRequest; ...@@ -10,6 +11,7 @@ import io.dataease.controller.sys.base.BaseGridRequest;
import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.dto.dataset.DataSetTaskDTO;
import io.dataease.service.dataset.DataSetTableTaskLogService; import io.dataease.service.dataset.DataSetTableTaskLogService;
import io.dataease.service.dataset.DataSetTableTaskService; import io.dataease.service.dataset.DataSetTableTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -20,6 +22,8 @@ import java.util.List; ...@@ -20,6 +22,8 @@ import java.util.List;
* @Author gin * @Author gin
* @Date 2021/3/4 1:32 下午 * @Date 2021/3/4 1:32 下午
*/ */
@Api(tags = "数据集:数据集任务")
@ApiSupport(order = 90)
@RestController @RestController
@RequestMapping("dataset/task") @RequestMapping("dataset/task")
public class DataSetTableTaskController { public class DataSetTableTaskController {
...@@ -28,22 +32,25 @@ public class DataSetTableTaskController { ...@@ -28,22 +32,25 @@ public class DataSetTableTaskController {
@Resource @Resource
private DataSetTableTaskLogService dataSetTableTaskLogService; private DataSetTableTaskLogService dataSetTableTaskLogService;
@ApiOperation("保存")
@PostMapping("save") @PostMapping("save")
public DatasetTableTask save(@RequestBody DataSetTaskRequest dataSetTaskRequest) throws Exception { public DatasetTableTask save(@RequestBody DataSetTaskRequest dataSetTaskRequest) throws Exception {
return dataSetTableTaskService.save(dataSetTaskRequest); return dataSetTableTaskService.save(dataSetTaskRequest);
} }
@ApiOperation("删除")
@PostMapping("delete/{id}") @PostMapping("delete/{id}")
public void delete(@PathVariable String id) { public void delete(@PathVariable String id) {
dataSetTableTaskService.delete(id); dataSetTableTaskService.delete(id);
} }
@ApiOperation("查询")
@PostMapping("list") @PostMapping("list")
public List<DatasetTableTask> list(@RequestBody DatasetTableTask datasetTableTask) { public List<DatasetTableTask> list(@RequestBody DatasetTableTask datasetTableTask) {
return dataSetTableTaskService.list(datasetTableTask); return dataSetTableTaskService.list(datasetTableTask);
} }
@ApiOperation("查看数据集任务") @ApiOperation("分页查询")
@PostMapping("/pageList/{goPage}/{pageSize}") @PostMapping("/pageList/{goPage}/{pageSize}")
public Pager<List<DataSetTaskDTO>> taskList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody BaseGridRequest request) { public Pager<List<DataSetTaskDTO>> taskList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody BaseGridRequest request) {
Page<Object> page = PageHelper.startPage(goPage, pageSize, true); Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
...@@ -51,16 +58,19 @@ public class DataSetTableTaskController { ...@@ -51,16 +58,19 @@ public class DataSetTableTaskController {
return PageUtils.setPageInfo(page, dataSetTableTaskService.taskList4User(request)); return PageUtils.setPageInfo(page, dataSetTableTaskService.taskList4User(request));
} }
@ApiOperation("上次执行时间")
@PostMapping("/lastExecStatus") @PostMapping("/lastExecStatus")
public DataSetTaskDTO lastExecStatus(@RequestBody DataSetTaskDTO datasetTableTask) { public DataSetTaskDTO lastExecStatus(@RequestBody DataSetTaskDTO datasetTableTask) {
return dataSetTableTaskLogService.lastExecStatus(datasetTableTask); return dataSetTableTaskLogService.lastExecStatus(datasetTableTask);
} }
@ApiOperation("更新状态")
@PostMapping("/updateStatus") @PostMapping("/updateStatus")
public void updateStatus(@RequestBody DatasetTableTask datasetTableTask) { public void updateStatus(@RequestBody DatasetTableTask datasetTableTask) {
dataSetTableTaskService.updateDatasetTableTaskStatus(datasetTableTask); dataSetTableTaskService.updateDatasetTableTaskStatus(datasetTableTask);
} }
@ApiOperation("执行任务")
@PostMapping("/execTask") @PostMapping("/execTask")
public void execTask(@RequestBody DatasetTableTask datasetTableTask) throws Exception{ public void execTask(@RequestBody DatasetTableTask datasetTableTask) throws Exception{
dataSetTableTaskService.execTask(datasetTableTask); dataSetTableTaskService.execTask(datasetTableTask);
......
...@@ -2,12 +2,15 @@ package io.dataease.controller.dataset; ...@@ -2,12 +2,15 @@ package io.dataease.controller.dataset;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.DatasetTableTaskLog; import io.dataease.base.domain.DatasetTableTaskLog;
import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.PageUtils;
import io.dataease.commons.utils.Pager; import io.dataease.commons.utils.Pager;
import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.controller.sys.base.BaseGridRequest;
import io.dataease.dto.dataset.DataSetTaskLogDTO; import io.dataease.dto.dataset.DataSetTaskLogDTO;
import io.dataease.service.dataset.DataSetTableTaskLogService; import io.dataease.service.dataset.DataSetTableTaskLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -17,22 +20,27 @@ import java.util.List; ...@@ -17,22 +20,27 @@ import java.util.List;
* @Author gin * @Author gin
* @Date 2021/3/4 1:32 下午 * @Date 2021/3/4 1:32 下午
*/ */
@Api(tags = "数据集:数据集任务执行记录")
@ApiSupport(order = 100)
@RestController @RestController
@RequestMapping("dataset/taskLog") @RequestMapping("dataset/taskLog")
public class DataSetTableTaskLogController { public class DataSetTableTaskLogController {
@Resource @Resource
private DataSetTableTaskLogService dataSetTableTaskLogService; private DataSetTableTaskLogService dataSetTableTaskLogService;
@ApiOperation("保存")
@PostMapping("save") @PostMapping("save")
public DatasetTableTaskLog save(@RequestBody DatasetTableTaskLog datasetTableTaskLog) { public DatasetTableTaskLog save(@RequestBody DatasetTableTaskLog datasetTableTaskLog) {
return dataSetTableTaskLogService.save(datasetTableTaskLog); return dataSetTableTaskLogService.save(datasetTableTaskLog);
} }
@ApiOperation("删除")
@PostMapping("delete/{id}") @PostMapping("delete/{id}")
public void delete(@PathVariable String id) { public void delete(@PathVariable String id) {
dataSetTableTaskLogService.delete(id); dataSetTableTaskLogService.delete(id);
} }
@ApiOperation("分页查询")
@PostMapping("list/{type}/{goPage}/{pageSize}") @PostMapping("list/{type}/{goPage}/{pageSize}")
public Pager<List<DataSetTaskLogDTO>> list(@RequestBody BaseGridRequest request, @PathVariable String type, @PathVariable int goPage, @PathVariable int pageSize) { public Pager<List<DataSetTaskLogDTO>> list(@RequestBody BaseGridRequest request, @PathVariable String type, @PathVariable int goPage, @PathVariable int pageSize) {
Page<Object> page = PageHelper.startPage(goPage, pageSize, true); Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
......
package io.dataease.controller.dataset; package io.dataease.controller.dataset;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.DatasetTableUnion; import io.dataease.base.domain.DatasetTableUnion;
import io.dataease.dto.dataset.DataSetTableUnionDTO; import io.dataease.dto.dataset.DataSetTableUnionDTO;
import io.dataease.service.dataset.DataSetTableUnionService; import io.dataease.service.dataset.DataSetTableUnionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -12,22 +15,27 @@ import java.util.List; ...@@ -12,22 +15,27 @@ import java.util.List;
* @Author gin * @Author gin
* @Date 2021/5/7 10:30 上午 * @Date 2021/5/7 10:30 上午
*/ */
@Api(tags = "数据集:数据集关联")
@ApiSupport(order = 70)
@RestController @RestController
@RequestMapping("dataset/union") @RequestMapping("dataset/union")
public class DataSetTableUnionController { public class DataSetTableUnionController {
@Resource @Resource
private DataSetTableUnionService dataSetTableUnionService; private DataSetTableUnionService dataSetTableUnionService;
@ApiOperation("保存")
@PostMapping("save") @PostMapping("save")
public DatasetTableUnion save(@RequestBody DatasetTableUnion datasetTableUnion) { public DatasetTableUnion save(@RequestBody DatasetTableUnion datasetTableUnion) {
return dataSetTableUnionService.save(datasetTableUnion); return dataSetTableUnionService.save(datasetTableUnion);
} }
@ApiOperation("删除")
@PostMapping("delete/{id}") @PostMapping("delete/{id}")
public void delete(@PathVariable String id) { public void delete(@PathVariable String id) {
dataSetTableUnionService.delete(id); dataSetTableUnionService.delete(id);
} }
@ApiOperation("查询")
@PostMapping("listByTableId/{tableId}") @PostMapping("listByTableId/{tableId}")
public List<DataSetTableUnionDTO> listByTableId(@PathVariable String tableId) { public List<DataSetTableUnionDTO> listByTableId(@PathVariable String tableId) {
return dataSetTableUnionService.listByTableId(tableId); return dataSetTableUnionService.listByTableId(tableId);
......
package io.dataease.controller.dataset; package io.dataease.controller.dataset;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.DatasetTableFunction; import io.dataease.base.domain.DatasetTableFunction;
import io.dataease.service.dataset.DatasetFunctionService; import io.dataease.service.dataset.DatasetFunctionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -14,12 +17,15 @@ import java.util.List; ...@@ -14,12 +17,15 @@ import java.util.List;
* @Author gin * @Author gin
* @Date 2021/7/29 11:58 上午 * @Date 2021/7/29 11:58 上午
*/ */
@Api(tags = "数据集:数据集方法")
@ApiSupport(order = 80)
@RestController @RestController
@RequestMapping("dataset/function") @RequestMapping("dataset/function")
public class DatasetFunctionController { public class DatasetFunctionController {
@Resource @Resource
private DatasetFunctionService datasetFunctionService; private DatasetFunctionService datasetFunctionService;
@ApiOperation("查询")
@PostMapping("listByTableId/{tableId}") @PostMapping("listByTableId/{tableId}")
public List<DatasetTableFunction> listByTableId(@PathVariable String tableId) { public List<DatasetTableFunction> listByTableId(@PathVariable String tableId) {
return datasetFunctionService.listByTableId(tableId); return datasetFunctionService.listByTableId(tableId);
......
package io.dataease.controller.panel; package io.dataease.controller.panel;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.service.panel.PanelGroupService; import io.dataease.service.panel.PanelGroupService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -10,6 +13,8 @@ import javax.annotation.Resource; ...@@ -10,6 +13,8 @@ import javax.annotation.Resource;
* Date: 2021-03-05 * Date: 2021-03-05
* Description: * Description:
*/ */
@Api(tags = "仪表板:设计")
@ApiSupport(order = 140)
@RestController @RestController
@RequestMapping("panel/design") @RequestMapping("panel/design")
public class PanelDesignController { public class PanelDesignController {
...@@ -17,6 +22,7 @@ public class PanelDesignController { ...@@ -17,6 +22,7 @@ public class PanelDesignController {
@Resource @Resource
private PanelGroupService panelGroupService; private PanelGroupService panelGroupService;
@ApiOperation("保存")
@PostMapping("/saveDesign/{id}") @PostMapping("/saveDesign/{id}")
public void deleteCircle(@PathVariable String id) { public void deleteCircle(@PathVariable String id) {
panelGroupService.deleteCircle(id); panelGroupService.deleteCircle(id);
......
package io.dataease.controller.panel; package io.dataease.controller.panel;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.PanelGroup; import io.dataease.base.domain.PanelGroup;
import io.dataease.base.domain.PanelGroupWithBLOBs; import io.dataease.base.domain.PanelGroupWithBLOBs;
import io.dataease.controller.handler.annotation.I18n; import io.dataease.controller.handler.annotation.I18n;
import io.dataease.controller.request.panel.PanelGroupRequest; import io.dataease.controller.request.panel.PanelGroupRequest;
import io.dataease.dto.panel.PanelGroupDTO; import io.dataease.dto.panel.PanelGroupDTO;
import io.dataease.service.panel.PanelGroupService; import io.dataease.service.panel.PanelGroupService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -16,6 +19,8 @@ import java.util.List; ...@@ -16,6 +19,8 @@ import java.util.List;
* Date: 2021-03-05 * Date: 2021-03-05
* Description: * Description:
*/ */
@Api(tags = "仪表板:仪表板组")
@ApiSupport(order = 150)
@RestController @RestController
@RequestMapping("panel/group") @RequestMapping("panel/group")
public class PanelGroupController { public class PanelGroupController {
...@@ -23,27 +28,32 @@ public class PanelGroupController { ...@@ -23,27 +28,32 @@ public class PanelGroupController {
@Resource @Resource
private PanelGroupService panelGroupService; private PanelGroupService panelGroupService;
@ApiOperation("查询树")
@PostMapping("/tree") @PostMapping("/tree")
public List<PanelGroupDTO> tree(@RequestBody PanelGroupRequest request) { public List<PanelGroupDTO> tree(@RequestBody PanelGroupRequest request) {
return panelGroupService.tree(request); return panelGroupService.tree(request);
} }
@ApiOperation("默认树")
@PostMapping("/defaultTree") @PostMapping("/defaultTree")
public List<PanelGroupDTO> defaultTree(@RequestBody PanelGroupRequest request) { public List<PanelGroupDTO> defaultTree(@RequestBody PanelGroupRequest request) {
return panelGroupService.defaultTree(request); return panelGroupService.defaultTree(request);
} }
@ApiOperation("保存")
@PostMapping("/save") @PostMapping("/save")
@I18n @I18n
public PanelGroup saveOrUpdate(@RequestBody PanelGroupRequest request) { public PanelGroup saveOrUpdate(@RequestBody PanelGroupRequest request) {
return panelGroupService.saveOrUpdate(request); return panelGroupService.saveOrUpdate(request);
} }
@ApiOperation("删除")
@PostMapping("/deleteCircle/{id}") @PostMapping("/deleteCircle/{id}")
public void deleteCircle(@PathVariable String id) { public void deleteCircle(@PathVariable String id) {
panelGroupService.deleteCircle(id); panelGroupService.deleteCircle(id);
} }
@ApiOperation("详息")
@GetMapping("/findOne/{id}") @GetMapping("/findOne/{id}")
public PanelGroupWithBLOBs findOne(@PathVariable String id) throws Exception { public PanelGroupWithBLOBs findOne(@PathVariable String id) throws Exception {
return panelGroupService.findOne(id); return panelGroupService.findOne(id);
......
package io.dataease.controller.panel; package io.dataease.controller.panel;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.PanelSubject; import io.dataease.base.domain.PanelSubject;
import io.dataease.controller.request.panel.PanelSubjectRequest; import io.dataease.controller.request.panel.PanelSubjectRequest;
import io.dataease.service.panel.PanelSubjectService; import io.dataease.service.panel.PanelSubjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -13,6 +16,8 @@ import java.util.List; ...@@ -13,6 +16,8 @@ import java.util.List;
* Date: 2021-05-06 * Date: 2021-05-06
* Description: * Description:
*/ */
@Api(tags = "仪表板:主题")
@ApiSupport(order = 160)
@RestController @RestController
@RequestMapping("panel/subject") @RequestMapping("panel/subject")
public class PanelSubjectController { public class PanelSubjectController {
...@@ -20,22 +25,25 @@ public class PanelSubjectController { ...@@ -20,22 +25,25 @@ public class PanelSubjectController {
@Resource @Resource
private PanelSubjectService panelSubjectService; private PanelSubjectService panelSubjectService;
@ApiOperation("查询")
@PostMapping("/query") @PostMapping("/query")
public List<PanelSubject> query(@RequestBody PanelSubjectRequest request) { public List<PanelSubject> query(@RequestBody PanelSubjectRequest request) {
return panelSubjectService.query(request); return panelSubjectService.query(request);
} }
@ApiOperation("根据仪表板查询")
@PostMapping("/querySubjectWithGroup") @PostMapping("/querySubjectWithGroup")
public List<PanelSubject> querySubjectWithGroup(@RequestBody PanelSubjectRequest request) { public List<PanelSubject> querySubjectWithGroup(@RequestBody PanelSubjectRequest request) {
return panelSubjectService.querySubjectWithGroup(request); return panelSubjectService.querySubjectWithGroup(request);
} }
@ApiOperation("更新")
@PostMapping("/update") @PostMapping("/update")
public void update(@RequestBody PanelSubjectRequest request) { public void update(@RequestBody PanelSubjectRequest request) {
panelSubjectService.update(request); panelSubjectService.update(request);
} }
@ApiOperation("删除")
@DeleteMapping("/delete/{id}") @DeleteMapping("/delete/{id}")
public void update(@PathVariable String id) { public void update(@PathVariable String id) {
panelSubjectService.delete(id); panelSubjectService.delete(id);
......
package io.dataease.controller.panel; package io.dataease.controller.panel;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.PanelTemplateWithBLOBs; import io.dataease.base.domain.PanelTemplateWithBLOBs;
import io.dataease.controller.handler.annotation.I18n; import io.dataease.controller.handler.annotation.I18n;
import io.dataease.controller.request.panel.PanelTemplateRequest; import io.dataease.controller.request.panel.PanelTemplateRequest;
import io.dataease.dto.panel.PanelTemplateDTO; import io.dataease.dto.panel.PanelTemplateDTO;
import io.dataease.service.panel.PanelTemplateService; import io.dataease.service.panel.PanelTemplateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -15,6 +18,8 @@ import java.util.List; ...@@ -15,6 +18,8 @@ import java.util.List;
* Date: 2021-03-05 * Date: 2021-03-05
* Description: * Description:
*/ */
@Api(tags = "仪表板:模版")
@ApiSupport(order = 170)
@RestController @RestController
@RequestMapping("template") @RequestMapping("template")
public class PanelTemplateController { public class PanelTemplateController {
...@@ -22,33 +27,38 @@ public class PanelTemplateController { ...@@ -22,33 +27,38 @@ public class PanelTemplateController {
@Resource @Resource
private PanelTemplateService panelTemplateService; private PanelTemplateService panelTemplateService;
@ApiOperation("查询树")
@PostMapping("/templateList") @PostMapping("/templateList")
@I18n @I18n
public List<PanelTemplateDTO> templateList(@RequestBody PanelTemplateRequest request) { public List<PanelTemplateDTO> templateList(@RequestBody PanelTemplateRequest request) {
return panelTemplateService.templateList(request); return panelTemplateService.templateList(request);
} }
@ApiOperation("保存")
@PostMapping("/save") @PostMapping("/save")
public PanelTemplateDTO save(@RequestBody PanelTemplateRequest request) { public PanelTemplateDTO save(@RequestBody PanelTemplateRequest request) {
return panelTemplateService.save(request); return panelTemplateService.save(request);
} }
@ApiOperation("删除")
@DeleteMapping("/delete/{id}") @DeleteMapping("/delete/{id}")
public void delete(@PathVariable String id) { public void delete(@PathVariable String id) {
panelTemplateService.delete(id); panelTemplateService.delete(id);
} }
@ApiOperation("详息")
@GetMapping("/findOne/{id}") @GetMapping("/findOne/{id}")
public PanelTemplateWithBLOBs findOne(@PathVariable String id) throws Exception { public PanelTemplateWithBLOBs findOne(@PathVariable String id) throws Exception {
return panelTemplateService.findOne(id); return panelTemplateService.findOne(id);
} }
@ApiOperation("查询")
@PostMapping("/find") @PostMapping("/find")
public List<PanelTemplateDTO> find(@RequestBody PanelTemplateRequest request) { public List<PanelTemplateDTO> find(@RequestBody PanelTemplateRequest request) {
return panelTemplateService.find(request); return panelTemplateService.find(request);
} }
@ApiOperation("名称校验")
@PostMapping("/nameCheck") @PostMapping("/nameCheck")
public String nameCheck(@RequestBody PanelTemplateRequest request) { public String nameCheck(@RequestBody PanelTemplateRequest request) {
return panelTemplateService.nameCheck(request); return panelTemplateService.nameCheck(request);
......
package io.dataease.controller.panel.api; package io.dataease.controller.panel.api;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.controller.request.chart.ChartExtRequest; import io.dataease.controller.request.chart.ChartExtRequest;
import io.dataease.controller.request.panel.link.EnablePwdRequest; import io.dataease.controller.request.panel.link.EnablePwdRequest;
import io.dataease.controller.request.panel.link.LinkRequest; import io.dataease.controller.request.panel.link.LinkRequest;
...@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Map; import java.util.Map;
@Api(tags = "仪表板:链接管理") @Api(tags = "仪表板:链接管理")
@ApiSupport(order = 200)
@RequestMapping("/api/link") @RequestMapping("/api/link")
public interface LinkApi { public interface LinkApi {
......
package io.dataease.controller.panel.api; package io.dataease.controller.panel.api;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.PanelShare; import io.dataease.base.domain.PanelShare;
import io.dataease.controller.request.panel.PanelShareFineDto; import io.dataease.controller.request.panel.PanelShareFineDto;
import io.dataease.controller.request.panel.PanelShareRequest; import io.dataease.controller.request.panel.PanelShareRequest;
...@@ -9,6 +10,7 @@ import io.swagger.annotations.Api; ...@@ -9,6 +10,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List; import java.util.List;
...@@ -16,9 +18,11 @@ import java.util.List; ...@@ -16,9 +18,11 @@ import java.util.List;
* 分享API * 分享API
*/ */
@Api(tags = "仪表板:分享管理") @Api(tags = "仪表板:分享管理")
@ApiSupport(order = 180)
@RequestMapping("/api/share") @RequestMapping("/api/share")
public interface ShareApi { public interface ShareApi {
@ApiIgnore
@ApiOperation("创建分享") @ApiOperation("创建分享")
@PostMapping("/") @PostMapping("/")
void share(PanelShareRequest request); void share(PanelShareRequest request);
......
package io.dataease.controller.panel.api; package io.dataease.controller.panel.api;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.controller.sys.base.BaseGridRequest;
import io.dataease.dto.panel.PanelStoreDto; import io.dataease.dto.panel.PanelStoreDto;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -16,6 +17,7 @@ import java.util.List; ...@@ -16,6 +17,7 @@ import java.util.List;
*/ */
@Api(tags = "仪表板:收藏管理") @Api(tags = "仪表板:收藏管理")
@ApiSupport(order = 190)
@RequestMapping("/api/store") @RequestMapping("/api/store")
public interface StoreApi { public interface StoreApi {
......
package io.dataease.controller.panel.api; package io.dataease.controller.panel.api;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.ChartView; import io.dataease.base.domain.ChartView;
import io.dataease.base.domain.ChartViewWithBLOBs; import io.dataease.base.domain.ChartViewWithBLOBs;
import io.dataease.dto.panel.PanelViewDto; import io.dataease.dto.panel.PanelViewDto;
...@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import java.util.List; import java.util.List;
@Api(tags = "仪表板:视图管理") @Api(tags = "仪表板:视图管理")
@ApiSupport(order = 210)
@RequestMapping("/api/panelView") @RequestMapping("/api/panelView")
public interface ViewApi { public interface ViewApi {
......
...@@ -4,10 +4,12 @@ package io.dataease.controller.sys; ...@@ -4,10 +4,12 @@ package io.dataease.controller.sys;
import io.dataease.commons.license.F2CLicenseResponse; import io.dataease.commons.license.F2CLicenseResponse;
import io.dataease.service.AboutService; import io.dataease.service.AboutService;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Map; import java.util.Map;
@ApiIgnore
@RequestMapping("/about") @RequestMapping("/about")
@RestController @RestController
public class AboutController { public class AboutController {
......
...@@ -6,9 +6,11 @@ import org.springframework.web.bind.annotation.GetMapping; ...@@ -6,9 +6,11 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
@ApiIgnore
@RestController @RestController
@RequestMapping("common-files") @RequestMapping("common-files")
public class CommonFilesController { public class CommonFilesController {
......
...@@ -6,10 +6,12 @@ import org.springframework.web.bind.annotation.GetMapping; ...@@ -6,10 +6,12 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.IOException; import java.io.IOException;
@ApiIgnore
@RestController @RestController
@RequestMapping @RequestMapping
public class DisplayController { public class DisplayController {
......
...@@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.Cookie; import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -17,6 +19,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -17,6 +19,7 @@ import javax.servlet.http.HttpServletResponse;
/** /**
* Created by liqiang on 2019/4/1. * Created by liqiang on 2019/4/1.
*/ */
@ApiIgnore
@RestController @RestController
public class I18nController { public class I18nController {
......
...@@ -11,8 +11,11 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -11,8 +11,11 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
@ApiIgnore
@RestController @RestController
@RequestMapping(headers = "Accept=application/json") @RequestMapping(headers = "Accept=application/json")
public class LicenseController { public class LicenseController {
......
package io.dataease.controller.message; package io.dataease.controller.sys;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.SysMsgChannel; import io.dataease.base.domain.SysMsgChannel;
import io.dataease.base.domain.SysMsgSetting; import io.dataease.base.domain.SysMsgSetting;
import io.dataease.base.domain.SysMsgType; import io.dataease.base.domain.SysMsgType;
import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.PageUtils;
import io.dataease.commons.utils.Pager; import io.dataease.commons.utils.Pager;
import io.dataease.controller.message.dto.*; import io.dataease.controller.sys.request.BatchSettingRequest;
import io.dataease.controller.sys.request.MsgRequest;
import io.dataease.controller.sys.request.MsgSettingRequest;
import io.dataease.controller.sys.response.MsgGridDto;
import io.dataease.controller.sys.response.SettingTreeNode;
import io.dataease.service.message.SysMsgService; import io.dataease.service.message.SysMsgService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -19,6 +24,7 @@ import java.util.List; ...@@ -19,6 +24,7 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Api(tags = "系统:消息管理") @Api(tags = "系统:消息管理")
@ApiSupport(order = 230)
@RequestMapping("/api/sys_msg") @RequestMapping("/api/sys_msg")
@RestController @RestController
public class MsgController { public class MsgController {
...@@ -26,7 +32,7 @@ public class MsgController { ...@@ -26,7 +32,7 @@ public class MsgController {
@Resource @Resource
private SysMsgService sysMsgService; private SysMsgService sysMsgService;
@ApiOperation("查询消息") @ApiOperation("分页查询")
@PostMapping("/list/{goPage}/{pageSize}") @PostMapping("/list/{goPage}/{pageSize}")
public Pager<List<MsgGridDto>> messages(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody MsgRequest msgRequest) { public Pager<List<MsgGridDto>> messages(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody MsgRequest msgRequest) {
Long userId = AuthUtils.getUser().getUserId(); Long userId = AuthUtils.getUser().getUserId();
...@@ -40,50 +46,59 @@ public class MsgController { ...@@ -40,50 +46,59 @@ public class MsgController {
return listPager; return listPager;
} }
@ApiOperation("设置已读")
@PostMapping("/setReaded/{msgId}") @PostMapping("/setReaded/{msgId}")
public void setReaded(@PathVariable Long msgId) { public void setReaded(@PathVariable Long msgId) {
sysMsgService.setReaded(msgId); sysMsgService.setReaded(msgId);
} }
@ApiOperation("批量设置已读")
@PostMapping("/batchRead") @PostMapping("/batchRead")
public void batchRead(@RequestBody List<Long> msgIds) { public void batchRead(@RequestBody List<Long> msgIds) {
sysMsgService.setBatchReaded(msgIds); sysMsgService.setBatchReaded(msgIds);
} }
@ApiOperation("批量删除")
@PostMapping("/batchDelete") @PostMapping("/batchDelete")
public void batchDelete(@RequestBody List<Long> msgIds) { public void batchDelete(@RequestBody List<Long> msgIds) {
sysMsgService.batchDelete(msgIds); sysMsgService.batchDelete(msgIds);
} }
@ApiOperation("查询类型")
@PostMapping("/types")
public List<SysMsgType> allTypes() {
List<SysMsgType> sysMsgTypes = sysMsgService.queryMsgTypes();
return sysMsgTypes;
}
@ApiOperation("类型树")
@PostMapping("/treeNodes") @PostMapping("/treeNodes")
public List<SettingTreeNode> treeNodes() { public List<SettingTreeNode> treeNodes() {
return sysMsgService.treeNodes(); return sysMsgService.treeNodes();
} }
@ApiOperation("查询渠道")
@PostMapping("/channelList") @PostMapping("/channelList")
public List<SysMsgChannel> channelList() { public List<SysMsgChannel> channelList() {
return sysMsgService.channelList(); return sysMsgService.channelList();
} }
@ApiOperation("查询订阅")
@PostMapping("/settingList") @PostMapping("/settingList")
public List<SysMsgSetting> settingList() { public List<SysMsgSetting> settingList() {
return sysMsgService.settingList(); return sysMsgService.settingList();
} }
@ApiOperation("更新订阅")
@PostMapping("/updateSetting") @PostMapping("/updateSetting")
public void updateSetting(@RequestBody MsgSettingRequest request) { public void updateSetting(@RequestBody MsgSettingRequest request) {
Long userId = AuthUtils.getUser().getUserId(); Long userId = AuthUtils.getUser().getUserId();
sysMsgService.updateSetting(request, userId); sysMsgService.updateSetting(request, userId);
} }
@PostMapping("/types") @ApiOperation("批量更新订阅")
public List<SysMsgType> allTypes() {
List<SysMsgType> sysMsgTypes = sysMsgService.queryMsgTypes();
return sysMsgTypes;
}
@PostMapping("/batchUpdate") @PostMapping("/batchUpdate")
public void batchUpdate(@RequestBody BatchSettingRequest request) { public void batchUpdate(@RequestBody BatchSettingRequest request) {
Long userId = AuthUtils.getUser().getUserId(); Long userId = AuthUtils.getUser().getUserId();
......
...@@ -15,9 +15,12 @@ import io.swagger.annotations.ApiOperation; ...@@ -15,9 +15,12 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ApiIgnore
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
@Api(tags = "系统:部门管理") @Api(tags = "系统:部门管理")
......
...@@ -15,11 +15,13 @@ import io.swagger.annotations.Api; ...@@ -15,11 +15,13 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ApiIgnore
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
@Api(tags = "系统:菜单管理") @Api(tags = "系统:菜单管理")
......
...@@ -13,11 +13,12 @@ import io.swagger.annotations.ApiOperation; ...@@ -13,11 +13,12 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ApiIgnore
@RestController @RestController
@Api(tags = "系统:插件管理") @Api(tags = "系统:插件管理")
@RequestMapping("/api/plugin") @RequestMapping("/api/plugin")
......
...@@ -14,9 +14,11 @@ import io.swagger.annotations.Api; ...@@ -14,9 +14,11 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
@ApiIgnore
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
@Api(tags = "系统:角色管理") @Api(tags = "系统:角色管理")
......
...@@ -3,6 +3,7 @@ package io.dataease.controller.sys; ...@@ -3,6 +3,7 @@ package io.dataease.controller.sys;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.auth.api.dto.CurrentUserDto;
import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.PageUtils;
...@@ -16,12 +17,15 @@ import io.dataease.service.sys.SysUserService; ...@@ -16,12 +17,15 @@ import io.dataease.service.sys.SysUserService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@RestController @RestController
@Api(tags = "系统:用户管理") @Api(tags = "系统:用户管理")
@ApiSupport(order = 220)
@RequestMapping("/api/user") @RequestMapping("/api/user")
public class SysUserController { public class SysUserController {
......
...@@ -11,12 +11,14 @@ import org.springframework.http.MediaType; ...@@ -11,12 +11,14 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ApiIgnore
@RestController @RestController
@RequestMapping(value = "/system") @RequestMapping(value = "/system")
public class SystemParameterController { public class SystemParameterController {
......
package io.dataease.controller.message.dto; package io.dataease.controller.sys.request;
import lombok.Data; import lombok.Data;
......
package io.dataease.controller.message.dto; package io.dataease.controller.sys.request;
import lombok.Data; import lombok.Data;
......
package io.dataease.controller.message.dto; package io.dataease.controller.sys.request;
import lombok.Data; import lombok.Data;
......
package io.dataease.controller.message.dto; package io.dataease.controller.sys.response;
import io.dataease.base.domain.SysMsg; import io.dataease.base.domain.SysMsg;
import lombok.Data; import lombok.Data;
......
package io.dataease.controller.message.dto; package io.dataease.controller.sys.response;
import lombok.Data; import lombok.Data;
......
package io.dataease.controller.message.dto; package io.dataease.controller.sys.response;
import lombok.Data; import lombok.Data;
......
...@@ -2,6 +2,7 @@ package io.dataease.datasource.controller; ...@@ -2,6 +2,7 @@ package io.dataease.datasource.controller;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.Datasource; import io.dataease.base.domain.Datasource;
import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.PageUtils;
...@@ -11,11 +12,16 @@ import io.dataease.controller.sys.base.BaseGridRequest; ...@@ -11,11 +12,16 @@ import io.dataease.controller.sys.base.BaseGridRequest;
import io.dataease.datasource.dto.DBTableDTO; import io.dataease.datasource.dto.DBTableDTO;
import io.dataease.datasource.service.DatasourceService; import io.dataease.datasource.service.DatasourceService;
import io.dataease.dto.DatasourceDTO; import io.dataease.dto.DatasourceDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
@Api(tags = "数据源:数据源管理")
@ApiSupport(order = 30)
@RequestMapping("datasource") @RequestMapping("datasource")
@RestController @RestController
public class DatasourceController { public class DatasourceController {
...@@ -23,16 +29,19 @@ public class DatasourceController { ...@@ -23,16 +29,19 @@ public class DatasourceController {
@Resource @Resource
private DatasourceService datasourceService; private DatasourceService datasourceService;
@ApiOperation("新增数据源")
@PostMapping("/add") @PostMapping("/add")
public Datasource addDatasource(@RequestBody Datasource datasource) { public Datasource addDatasource(@RequestBody Datasource datasource) {
return datasourceService.addDatasource(datasource); return datasourceService.addDatasource(datasource);
} }
@ApiOperation("验证数据源")
@PostMapping("/validate") @PostMapping("/validate")
public void validate(@RequestBody Datasource datasource) throws Exception { public void validate(@RequestBody Datasource datasource) throws Exception {
datasourceService.validate(datasource); datasourceService.validate(datasource);
} }
@ApiOperation("查询当前用户数据源")
@GetMapping("/list") @GetMapping("/list")
public List<DatasourceDTO> getDatasourceList() throws Exception { public List<DatasourceDTO> getDatasourceList() throws Exception {
DatasourceUnionRequest request = new DatasourceUnionRequest(); DatasourceUnionRequest request = new DatasourceUnionRequest();
...@@ -40,6 +49,7 @@ public class DatasourceController { ...@@ -40,6 +49,7 @@ public class DatasourceController {
return datasourceService.getDatasourceList(request); return datasourceService.getDatasourceList(request);
} }
@ApiIgnore
@PostMapping("/list/{goPage}/{pageSize}") @PostMapping("/list/{goPage}/{pageSize}")
public Pager<List<DatasourceDTO>> getDatasourceList(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception { public Pager<List<DatasourceDTO>> getDatasourceList(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception {
Page<Object> page = PageHelper.startPage(goPage, pageSize, true); Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
...@@ -47,21 +57,25 @@ public class DatasourceController { ...@@ -47,21 +57,25 @@ public class DatasourceController {
return PageUtils.setPageInfo(page, datasourceService.gridQuery(request)); return PageUtils.setPageInfo(page, datasourceService.gridQuery(request));
} }
@ApiOperation("删除数据源")
@PostMapping("/delete/{datasourceID}") @PostMapping("/delete/{datasourceID}")
public void deleteDatasource(@PathVariable(value = "datasourceID") String datasourceID) throws Exception { public void deleteDatasource(@PathVariable(value = "datasourceID") String datasourceID) throws Exception {
datasourceService.deleteDatasource(datasourceID); datasourceService.deleteDatasource(datasourceID);
} }
@ApiOperation("更新数据源")
@PostMapping("/update") @PostMapping("/update")
public void updateDatasource(@RequestBody Datasource Datasource) { public void updateDatasource(@RequestBody Datasource Datasource) {
datasourceService.updateDatasource(Datasource); datasourceService.updateDatasource(Datasource);
} }
@ApiOperation("查询数据源下属所有表")
@PostMapping("/getTables") @PostMapping("/getTables")
public List<DBTableDTO> getTables(@RequestBody Datasource datasource) throws Exception { public List<DBTableDTO> getTables(@RequestBody Datasource datasource) throws Exception {
return datasourceService.getTables(datasource); return datasourceService.getTables(datasource);
} }
@ApiIgnore
@PostMapping("/getSchema") @PostMapping("/getSchema")
public List<String> getSchema(@RequestBody Datasource datasource) throws Exception { public List<String> getSchema(@RequestBody Datasource datasource) throws Exception {
return datasourceService.getSchema(datasource); return datasourceService.getSchema(datasource);
......
package io.dataease.service.message; package io.dataease.service.message;
import io.dataease.controller.message.dto.SubscribeNode; import io.dataease.controller.sys.response.SubscribeNode;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
......
...@@ -10,7 +10,12 @@ import io.dataease.base.mapper.ext.ExtSysMsgMapper; ...@@ -10,7 +10,12 @@ import io.dataease.base.mapper.ext.ExtSysMsgMapper;
import io.dataease.commons.constants.SysMsgConstants; import io.dataease.commons.constants.SysMsgConstants;
import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.CommonBeanFactory; import io.dataease.commons.utils.CommonBeanFactory;
import io.dataease.controller.message.dto.*; import io.dataease.controller.sys.request.BatchSettingRequest;
import io.dataease.controller.sys.request.MsgRequest;
import io.dataease.controller.sys.request.MsgSettingRequest;
import io.dataease.controller.sys.response.MsgGridDto;
import io.dataease.controller.sys.response.SettingTreeNode;
import io.dataease.controller.sys.response.SubscribeNode;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CacheEvict;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论