Merge remote-tracking branch 'origin/master'

jiangping

2024-06-07 73af3ed9fbcc616cdecc739fc4307163c19c5764

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

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

import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictBiz;
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;
@@ -14,7 +15,6 @@
import com.doumee.service.system.SystemDictService;
import io.swagger.annotations.Api;
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.*;
@@ -28,7 +28,7 @@
 */
@Api(tags = "系统字典")
@RestController
@RequestMapping("/cloudService/system/dict")
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/dict")
public class SystemDictCloudController extends BaseController {

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

    @ApiOperation("删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("system:dict:delete")
    @CloudRequiredPermission("system:dict:delete")
    public ApiResponse deleteById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@PathVariable Integer id) {
        systemDictService.deleteById(id);
        return ApiResponse.success(null);
@@ -55,7 +56,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<>();
@@ -68,15 +69,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 SystemDict systemDict) {
        systemDict.setUpdateUser(this.getLoginUser(token).getId());
        systemDictBiz.updateById(systemDict);
        return ApiResponse.success(null);
    }

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