Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/controller/KeywordController.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.db.gen.entity.KeywordEntity;
import com.dg.core.service.IKeywordService;
import com.dg.core.util.TableDataInfo;
@@ -27,6 +28,7 @@
     */
    @ApiOperation("关键词列表接口")
    @GetMapping("/getlist")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize)
    {
@@ -45,6 +47,7 @@
     */
    @ApiOperation("关键词详情接口")
    @GetMapping("/getData")
    @Authorization
    public ResultData selectConfigData(@RequestParam(value = "id",required = false) String id,
                                       @RequestParam(value = "name",required = false) String name)
    {
@@ -58,6 +61,7 @@
     */
    @ApiOperation("关键词添加接口")
    @PostMapping("/add")
    @Authorization
    public ResultData insertConfig(@RequestBody KeywordEntity entity)
    {
        KeywordEntity enti=iKeywordService.selectConfigData("",entity.getName());
@@ -82,6 +86,7 @@
     */
    @ApiOperation("关键词编辑接口")
    @PostMapping("/update")
    @Authorization
    public ResultData updateConfig(@RequestBody KeywordEntity entity)
    {
        return toAjax(iKeywordService.updateConfig(entity));
@@ -94,6 +99,7 @@
     */
    @ApiOperation("关键词删除接口")
    @DeleteMapping("/delete")
    @Authorization
    public ResultData deleteConfigById(String Id)
    {
        return toAjax(iKeywordService.deleteConfigById(Id));