优化

zhanghua

2023-09-08 7ef4892f9f24f941aca37e6b3991b808a0aca619

 ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java

@@ -5,10 +5,10 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.service.caseHandler.IIllegalBuildingService;
import com.ycl.service.dict.IDataDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -36,97 +36,98 @@
    IDataDictionaryService iDataDictionaryService;

    /**
     * @return com.ycl.api.CommonResult
     * @Description 查询违建类型
     * @Param [size, current, keyWord]
     * @return com.ycl.api.CommonResult
     **/
    @ApiOperation(value = "查询违建类型")
    @GetMapping("/query")
    public CommonResult searchIllegalBuilding(@RequestParam Integer size,
                                              @RequestParam Integer current,
                                              @RequestParam(required = false) String keyWord) {
        Page<DataDictionary> dataDictionaryPage = new Page<>();
        dataDictionaryPage.setSize(size);
        dataDictionaryPage.setCurrent(current);
        return CommonResult.success(iDataDictionaryService.listIllegalBuildingSettings(dataDictionaryPage,keyWord));

        return CommonResult.success(iDataDictionaryService.listIllegalBuildingSettings(current, size, keyWord));
    }

    /**
     * @Description  delete illegal building by id
     * @Param [id]
     * @return com.ycl.api.CommonResult
     * @Description delete illegal building by id
     * @Param [id]
     **/
    @ApiOperation(value = "删除违建类型")
    @DeleteMapping("/delete")
    public CommonResult removeIllegalBuilding(@RequestParam Integer id){
    @LogSave(operationType = "运营基础设置", contain = "删除违建事项")
    public CommonResult removeIllegalBuilding(@RequestParam Integer id) {
        return CommonResult.success(iDataDictionaryService.removeById(id));
    }

    /**
     * @return com.ycl.api.CommonResult
     * @Description batch delete illegal building
     * @Param [ids]
     * @return com.ycl.api.CommonResult
     **/
    @ApiOperation(value = "批量删除违规类型")
    @ApiOperation(value = "批量删除违建类型")
    @DeleteMapping("/batch_delete")
    public CommonResult removeIllegalBuildings(@RequestParam String[] ids){
    @LogSave(operationType = "运营基础设置", contain = "批量删除违建事项")
    public CommonResult removeIllegalBuildings(@RequestParam String[] ids) {
        return CommonResult.success(iDataDictionaryService.removeBatchByIds(Arrays.asList(ids)));
    }

    /**
     * @return com.ycl.api.CommonResult
     * @Description search illegal building  type first
     * @Param []
     * @return com.ycl.api.CommonResult
     **/
    @ApiOperation(value = "查询所属类型")
    @GetMapping("/query/type_first")
    public  CommonResult searchIllegalBuildingTypeFirst(){
        String typeLevel="1";
        String typeCode="06";
    public CommonResult searchIllegalBuildingTypeFirst() {
        String typeLevel = "1";
        String typeCode = "06";
        return CommonResult.success(iDataDictionaryService
                .list(new LambdaQueryWrapper<DataDictionary>()
                        .eq(DataDictionary::getLevel,typeLevel)
                        .eq(DataDictionary::getTypeCode,typeCode)));
                        .eq(DataDictionary::getLevel, typeLevel)
                        .eq(DataDictionary::getTypeCode, typeCode)));
    }

    /**
     * @return com.ycl.api.CommonResult
     * @Description search illegal building type second
     * @Param []
     * @return com.ycl.api.CommonResult
     **/
    @ApiOperation(value = "查询所属类别")
    @GetMapping("/query/type_second")
    public  CommonResult searchIllegalBuildingTypeSecond(){
        String typeLevel="2";
        String typeCode="06";
    public CommonResult searchIllegalBuildingTypeSecond() {
        String typeLevel = "2";
        String typeCode = "06";
        return CommonResult.success(iDataDictionaryService
                .list(new LambdaQueryWrapper<DataDictionary>()
                        .eq(DataDictionary::getLevel,typeLevel)
                        .eq(DataDictionary::getTypeCode,typeCode)));
                        .eq(DataDictionary::getLevel, typeLevel)
                        .eq(DataDictionary::getTypeCode, typeCode)));
    }

    /**
     * @return com.ycl.api.CommonResult
     * @Description modify illegal building type
     * @Param [typeFirst, id]
     * @return com.ycl.api.CommonResult
     **/
    @ApiOperation(value = "修改所属类型/类别")
    @PutMapping("/modification/type")
    public  CommonResult modifyIllegalBuildingType(@RequestParam String type,@RequestParam Integer id){
        return  CommonResult.success(iDataDictionaryService
    public CommonResult modifyIllegalBuildingType(@RequestParam String type, @RequestParam Integer id) {
        return CommonResult.success(iDataDictionaryService
                .update(new LambdaUpdateWrapper<DataDictionary>()
                        .eq(DataDictionary::getId,id)
                        .set(StringUtils.isNotBlank(type),DataDictionary::getName,type)));
                        .eq(DataDictionary::getId, id)
                        .set(StringUtils.isNotBlank(type), DataDictionary::getName, type)));
    }

    /**
     * @return com.ycl.api.CommonResult
     * @Description addition illegal building  type
     * @Param [dataDictionary]
     * @return com.ycl.api.CommonResult
     **/
    @ApiOperation(value = "添加所属类型/类别")
    @PostMapping("/addition/type")
    public  CommonResult addIllegalBuildingTypeFirst(@RequestBody @Validated DataDictionary dataDictionary){
    @LogSave(operationType = "运营基础设置", contain = "添加违建事项")
    public CommonResult addIllegalBuildingTypeFirst(@RequestBody @Validated DataDictionary dataDictionary) {
        return CommonResult.success(iDataDictionaryService.save(dataDictionary));
    }