From e70f05c79c91d5159524e6b6033206ad3fc8c02b Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期四, 20 四月 2023 10:17:10 +0800
Subject: [PATCH] 元数据联调修正
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java | 30 +++++++++++++-
Source/UBCS-WEB/src/api/omd/OmdAttribute.js | 52 ++++++++++++++++++++++++++
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdAttribute.java | 6 +++
Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml | 18 ++++----
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdAttributeServiceImpl.java | 2
5 files changed, 95 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/omd/OmdAttribute.js b/Source/UBCS-WEB/src/api/omd/OmdAttribute.js
new file mode 100644
index 0000000..783f658
--- /dev/null
+++ b/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
+ })
+}
+
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdAttribute.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdAttribute.java
index b3babc8..bcb3582 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdAttribute.java
+++ b/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;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java
index bcf4d68..122ecd5 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java
+++ b/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 = "浼犲叆鍏冩暟鎹璞�")
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdAttributeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdAttributeServiceImpl.java
index 9a483fe..1b53f5f 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdAttributeServiceImpl.java
+++ b/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;
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml
index a7f1891..a53ba7e 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml
+++ b/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"/>
--
Gitblit v1.9.3