Merge remote-tracking branch 'origin/master'

jiangping

2024-05-08 cab86bd5a10b4e574ced9748a3718a5aa2d1b84b

 server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java

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

import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.ApiResponse;
@@ -16,7 +17,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -30,7 +30,7 @@
 */
@Api(tags = "字典数据")
@RestController
@RequestMapping("/cloudService/system/dictData")
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/dictData")
public class SystemDictDataCloudController extends BaseController {

    @Autowired
@@ -42,14 +42,15 @@
    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("system:dict:update")
    @CloudRequiredPermission("system:dict:update")
    public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated(OperaType.Create.class) @RequestBody SystemDictData systemDictData) {
        systemDictData.setCreateUser(this.getLoginUser(token).getId());
        return ApiResponse.success(systemDictDataBiz.create(systemDictData));
    }

    @ApiOperation("删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("system:dict:update")
    @CloudRequiredPermission("system:dict:update")
    public ApiResponse deleteById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@PathVariable Integer id) {
        systemDictDataService.deleteById(id);
        return ApiResponse.success(null);
@@ -57,7 +58,7 @@

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("system:dict:delete")
    @CloudRequiredPermission("system:dict:delete")
    public ApiResponse deleteByIdInBatch(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam String ids) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
@@ -70,15 +71,16 @@

    @ApiOperation("修改")
    @PostMapping("/updateById")
    @RequiresPermissions("system:dict:update")
    @CloudRequiredPermission("system:dict:update")
    public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemDictData systemDictData) {
        systemDictData.setUpdateUser(this.getLoginUser(token).getId());
        systemDictDataBiz.updateById(systemDictData);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("system:dict:update")
    @CloudRequiredPermission("system:dict:update")
    public ApiResponse<PageData<SystemDictDataListVO>> findPage (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestBody PageWrap<QuerySystemDictDataDTO> pageWrap) {
        return ApiResponse.success(systemDictDataService.findPage(pageWrap));
    }