Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

5 天以前 0d7d874912d0147376826b55667a1deb6547ed91

 src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java

@@ -4,7 +4,6 @@
import java.util.List;

import jakarta.servlet.http.HttpServletResponse;

import lombok.AllArgsConstructor;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.validation.annotation.Validated;

import org.springframework.web.bind.annotation.DeleteMapping;

@@ -20,7 +19,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;

import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

import com.ruoyi.framework.web.controller.BaseController;

import com.ruoyi.framework.web.domain.AjaxResult;

import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;

import com.ruoyi.project.system.domain.SysDictData;

import com.ruoyi.project.system.service.ISysDictDataService;

@@ -63,23 +62,23 @@
     */

    @PreAuthorize("@ss.hasPermi('system:dict:query')")

    @GetMapping(value = "/{dictCode}")

    public AjaxResult getInfo(@PathVariable Long dictCode)

    public R<?> getInfo(@PathVariable Long dictCode)
    {

        return success(dictDataService.selectDictDataById(dictCode));

        return R.ok(dictDataService.selectDictDataById(dictCode));
    }



    /**

     * 根据字典类型查询字典数据信息

     */

    @GetMapping(value = "/type/{dictType}")

    public AjaxResult dictType(@PathVariable String dictType)

    public R<?> dictType(@PathVariable String dictType)
    {

        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);

        if (StringUtils.isNull(data))

        {

            data = new ArrayList<SysDictData>();

        }

        return success(data);

        return R.ok(data);
    }



    /**

@@ -88,10 +87,11 @@
    @PreAuthorize("@ss.hasPermi('system:dict:add')")

    @Log(title = "字典数据", businessType = BusinessType.INSERT)

    @PostMapping

    public AjaxResult add(@Validated @RequestBody SysDictData dict)

    public R<?> add(@Validated @RequestBody SysDictData dict)
    {

        dict.setCreateBy(getUsername());

        return toAjax(dictDataService.insertDictData(dict));

        dictDataService.insertDictData(dict);
        return R.ok();
    }



    /**

@@ -100,10 +100,11 @@
    @PreAuthorize("@ss.hasPermi('system:dict:edit')")

    @Log(title = "字典数据", businessType = BusinessType.UPDATE)

    @PutMapping

    public AjaxResult edit(@Validated @RequestBody SysDictData dict)

    public R<?> edit(@Validated @RequestBody SysDictData dict)
    {

        dict.setUpdateBy(getUsername());

        return toAjax(dictDataService.updateDictData(dict));

        dictDataService.updateDictData(dict);
        return R.ok();
    }



    /**

@@ -112,9 +113,9 @@
    @PreAuthorize("@ss.hasPermi('system:dict:remove')")

    @Log(title = "字典类型", businessType = BusinessType.DELETE)

    @DeleteMapping("/{dictCodes}")

    public AjaxResult remove(@PathVariable Long[] dictCodes)

    public R<?> remove(@PathVariable Long[] dictCodes)
    {

        dictDataService.deleteDictDataByIds(dictCodes);

        return success();

        return R.ok();
    }

}