Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java

@@ -1,6 +1,9 @@
package com.vci.ubcs.omd.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.omd.constant.OmdCacheConstant;
@@ -18,6 +21,8 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

@@ -67,7 +72,7 @@
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "查询列表", notes = "传入查询")
   public R<List<AttributeVO>> list(@ApiIgnore @RequestParam Map<String, Object> condition) {
      return R.data(AttributeWrapper.build().listEntityVO(attributeService.list(Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getKey))));
      return R.data(AttributeWrapper.build().listEntityVO(attributeService.list(Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getId))));
   }

   /**
@@ -80,11 +85,36 @@
   })
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "查询列表", notes = "传入查询")
   public R<IPage<AttributeVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
   public R<IPage<AttributeVO>> pageList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
      IPage<AttributeVO> pageVO = new Page<>();
      IPage<Attribute> page = attributeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getKey));
      IPage<Attribute> page = attributeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getId));
      BeanUtil.copy(page,pageVO);
      pageVO.setRecords( AttributeWrapper.build().listEntityVO(page.getRecords()));
      return R.data(pageVO);
   }

   @GetMapping("/query-page")
   @ApiImplicitParams({
      @ApiImplicitParam(name = "key",value = "属性名模糊",paramType = "query",dataType = "string"),
      @ApiImplicitParam(name = "notIn",value = "属性名排除",paramType = "query",dataType = "string")
   })
   @ApiOperationSupport(order = 6)
   @ApiOperation(value = "查询列表",notes = "传入查的值和不查的值")
   public R<IPage<AttributeVO>> queryPageList(String key,String notInStr,Query query){
      LambdaQueryWrapper<Attribute> wrapper = Wrappers.<Attribute>query().lambda();
      if (StringUtil.isNotBlank(notInStr)){
         List<String> notInList = Func.toStrList(",", notInStr);
         if (!CollectionUtils.isEmpty(notInList)){
            wrapper = wrapper.notIn(Attribute::getId,notInList);
         }
      }
      if (StringUtil.isNotBlank(key)){
         wrapper = wrapper.like(Attribute::getId,key);
      }
      IPage<Attribute> page = attributeService.page(Condition.getPage(query),wrapper.orderByAsc(Attribute::getId));
      IPage<AttributeVO> pageVO = new Page<>();
      BeanUtil.copy(page,pageVO);
      pageVO.setRecords(AttributeWrapper.build().listEntityVO(page.getRecords()));
      return R.data(pageVO);
   }

@@ -97,7 +127,7 @@
   @PostMapping("/submit")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "新增或修改", notes = "传入元数据对象")
   public R submit(@Valid @RequestBody AttributeDTO dto) {
   public R submit(@RequestBody AttributeDTO dto) {
      CacheUtil.clear(OmdCacheConstant.ATTR_CACHE);
      return R.status(attributeService.submit(dto));
   }
@@ -117,13 +147,13 @@

   /**
    * 查看应用范围
    * @param id 主键
    * @param oid 主键
    * @return 查询结果
    */
   @GetMapping("/applyRange")
   @GetMapping("/apply-range")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "查看应用范围",notes = "传入主键")
   public R applyRange(Long id){
      return R.data(attributeService.applyRange(id));
   public R applyRange(String oid){
      return R.data(attributeService.applyRange(oid));
   }
}