Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java

@@ -17,7 +17,6 @@
package com.vci.ubcs.code.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.CodeRuleDTO;
import com.vci.ubcs.code.entity.CodeRule;
@@ -25,27 +24,19 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.wrapper.CodeRuleWrapper;

import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.apache.http.util.EncodingUtils;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.rmi.ServerException;
import java.util.Collection;
import java.util.Map;

@@ -169,8 +160,7 @@
   @ApiOperationSupport(order = 11)
   @ApiOperation(value = "查看主数据编码规则的使用范围", notes = "传入oid")
   public R<Collection<CodeClassifyVO>> listUseRange(@Valid @RequestParam String oid){
      Collection<CodeClassifyVO> voList = codeRuleService.listUseRangeInCodeClassify(oid);
      return R.data(voList);
      return R.data(codeRuleService.listUseRangeInCodeClassify(oid));
   }

   /**
@@ -198,7 +188,7 @@
   @PostMapping("/clone")
   @ApiOperationSupport(order = 13)
   @ApiOperation(value = "克隆编码规则", notes = "传入codeRuleDTO")
   public R cloneCodeRule(@RequestBody CodeRuleDTO codeRuleDTO){
   public R cloneCodeRule(@RequestBody CodeRuleDTO codeRuleDTO) throws ServerException {
      return codeRuleService.cloneCodeRule(codeRuleDTO);
   }

@@ -222,9 +212,8 @@
   @GetMapping("/checkLikeCodeRule")
   @ApiOperationSupport(order = 15)
   @ApiOperation(value = "检查相似编码规则", notes = "传入oid")
   public R checkLikeCodeRule(String oid){
   public R checkLikeCodeRule(@Valid @RequestParam String oid){
      return codeRuleService.checkLikeCodeRule(oid);
   }


}