元数据联调修正

 Source/UBCS-WEB/src/api/omd/OmdAttribute.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
import request from '@/router/axios';

export const getList = (current, size, params) => {
  return request({
    url: '/api/ubcs-omd/attribute/list',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

export const getPage = (current, size, params) => {
  return request({
    url: '/api/ubcs-omd/attribute/page',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

export const remove = (ids) => {
  return request({
    url: '/api/ubcs-omd/attribute/remove',
    method: 'post',
    params: {
      ids,
    }
  })
}

export const add = (row) => {
  return request({
    url: '/api/ubcs-omd/attribute/submit',
    method: 'post',
    data: row
  })
}

export const update = (row) => {
  return request({
    url: '/api/ubcs-omd/attribute/submit',
    method: 'post',
    data: row
  })
}


 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdAttribute.java

@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -66,6 +67,7 @@
     * å±žæ€§ç±»åž‹å­—典显示名称
     */
    @Transient
    @TableField(exist = false)
    private String typeValue;


@@ -115,6 +117,7 @@
     * å‚照类型字典显示名称
     */
    @Transient
    @TableField(exist = false)
    private String referTypeValue;

    /**
@@ -152,6 +155,7 @@
     * å­—典显示值
     */
    @Transient
    @TableField(exist = false)
    private String dictValue;

    /**
@@ -163,11 +167,13 @@
     * æ¯”较方式
     */
    @Transient
    @TableField(exist = false)
    private String calculateType;

    /**
     * æ¯”较值
     */
    @Transient
    @TableField(exist = false)
    private String calculateValue;
}

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

@@ -1,5 +1,7 @@
package com.vci.ubcs.omd.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.omd.constant.OmdCacheConstant;
import com.vci.ubcs.omd.dto.OmdAttributeDTO;
@@ -7,13 +9,16 @@
import com.vci.ubcs.omd.service.IOmdAttributeService;
import com.vci.ubcs.omd.vo.OmdAttributeVO;
import com.vci.ubcs.omd.wrapper.OmdAttributeWrapper;
import com.vci.ubcs.system.vo.DictVO;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

@@ -66,10 +71,29 @@
    }

    /**
     * æ–°å¢žæˆ–修改
     * @param dto å…ƒæ•°æ®é¡µé¢ä¼ è¾“对象
     * @return æ‰§è¡Œç»“æžœ
     * åˆ†é¡µåˆ—表
     * @param condition æŸ¥è¯¢æ¡ä»¶
     */
    @GetMapping("/page")
    @ApiImplicitParams({
        @ApiImplicitParam(name = "key", value = "属性名", paramType = "query", dataType = "string"),
    })
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "查询列表", notes = "传入查询")
    public R<IPage<OmdAttributeVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
        IPage<OmdAttributeVO> pageVO = new Page<>();
        IPage<OmdAttribute> page = attributeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, OmdAttribute.class).lambda().orderByAsc(OmdAttribute::getKey));
        BeanUtil.copy(page,pageVO);
        pageVO.setRecords( OmdAttributeWrapper.build().listEntityVO(page.getRecords()));
        return R.data(pageVO);
    }


        /**
         * æ–°å¢žæˆ–修改
         * @param dto å…ƒæ•°æ®é¡µé¢ä¼ è¾“对象
         * @return æ‰§è¡Œç»“æžœ
         */
    @PostMapping("/submit")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "新增或修改", notes = "传入元数据对象")

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdAttributeServiceImpl.java

@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.core.log.exception.ServiceException;
import com.vci.ubcs.omd.constant.OmdCacheConstant;
import com.vci.ubcs.omd.dto.OmdAttributeDTO;
import com.vci.ubcs.omd.entity.OmdAttribute;
@@ -12,6 +11,7 @@
import com.vci.ubcs.omd.vo.OmdAttributeVO;
import com.vci.ubcs.omd.wrapper.OmdAttributeWrapper;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;

 Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml

@@ -5,14 +5,14 @@
    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="baseResultMap" type="com.vci.ubcs.omd.entity.OmdAttribute">
        <id column="id" property="id"/>
        <result column="create_user" property="createUser" jdbcType="NUMBER"/>
        <result column="create_dept" property="createDept" jdbcType="NUMBER"/>
        <result column="create_user" property="createUser" jdbcType="NUMERIC"/>
        <result column="create_dept" property="createDept" jdbcType="NUMERIC"/>
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
        <result column="update_user" property="updateUser" jdbcType="NUMBER"/>
        <result column="update_user" property="updateUser" jdbcType="NUMERIC"/>
        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
        <result column="status" property="status" jdbcType="NUMBER"/>
        <result column="is_deleted" property="isDeleted" jdbcType="NUMBER"/>
        <result column="tenant_id" property="tenantId" jdbcType="NUMBER"/>
        <result column="status" property="status" jdbcType="NUMERIC"/>
        <result column="is_deleted" property="isDeleted" jdbcType="NUMERIC"/>
        <result column="tenant_id" property="tenantId" jdbcType="NUMERIC"/>
        <result column="key" property="key" jdbcType="VARCHAR"/>
        <result column="label" property="label" jdbcType="VARCHAR"/>
        <result column="type" property="type" jdbcType="VARCHAR"/>
@@ -22,9 +22,9 @@

    <resultMap id="extraResultMap" type="com.vci.ubcs.omd.entity.OmdAttribute">
        <result column="nullable" property="nullable" jdbcType="VARCHAR"/>
        <result column="max_length" property="maxLength" jdbcType="NUMBER"/>
        <result column="precision" property="precision" jdbcType="NUMBER"/>
        <result column="refer_to_id" property="referToId" jdbcType="NUMBER"/>
        <result column="max_length" property="maxLength" jdbcType="NUMERIC"/>
        <result column="precision" property="precision" jdbcType="NUMERIC"/>
        <result column="refer_to_id" property="referToId" jdbcType="NUMERIC"/>
        <result column="refer_type" property="referType" jdbcType="VARCHAR"/>
        <result column="refer_to_name" property="referToName" jdbcType="VARCHAR"/>
        <result column="using_enum" property="usingEnum" jdbcType="VARCHAR"/>