From 126f0bc0d65f4ef8eeac5674b4757a882f4a87a0 Mon Sep 17 00:00:00 2001 From: cp3hnu Date: Wed, 24 Apr 2024 10:58:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E6=A8=A1=E5=9E=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- react-ui/config/config.ts | 2 +- react-ui/config/defaultSettings.ts | 2 +- react-ui/src/app.tsx | 1 + react-ui/src/global.less | 33 +++++++------------ react-ui/src/pages/Model/personalData.jsx | 10 ++++-- .../Pipeline/editPipeline/modelMenus.jsx | 5 +-- react-ui/src/pages/User/Login/index.tsx | 6 ++-- 7 files changed, 27 insertions(+), 32 deletions(-) diff --git a/react-ui/config/config.ts b/react-ui/config/config.ts index 961f002..405f85c 100644 --- a/react-ui/config/config.ts +++ b/react-ui/config/config.ts @@ -76,7 +76,7 @@ export default defineConfig({ * @name layout 插件 * @doc https://umijs.org/docs/max/layout-menu */ - title: '复杂智能软件', + title: '智能软件开发平台', layout: { locale: true, ...defaultSettings, diff --git a/react-ui/config/defaultSettings.ts b/react-ui/config/defaultSettings.ts index 4acad99..1888907 100644 --- a/react-ui/config/defaultSettings.ts +++ b/react-ui/config/defaultSettings.ts @@ -16,7 +16,7 @@ const Settings: ProLayoutProps & { fixSiderbar: false, splitMenus: false, colorWeak: false, - title: '复杂智能软件', + title: '智能软件开发平台', pwa: true, logo: '/assets/images/left-top-logo.png', iconfontUrl: '//at.alicdn.com/t/c/font_4511326_ndnvm4elll.js', diff --git a/react-ui/src/app.tsx b/react-ui/src/app.tsx index 1d11a6e..10ab35b 100644 --- a/react-ui/src/app.tsx +++ b/react-ui/src/app.tsx @@ -193,6 +193,7 @@ export const antd: RuntimeAntdConfig = (memo) => { colorSuccess: themes['successColor'], colorError: themes['errorColor'], colorWarning: themes['warningColor'], + colorLink: themes['primaryColor'], }; memo.theme.components ??= {}; memo.theme.components.Tabs = {}; diff --git a/react-ui/src/global.less b/react-ui/src/global.less index 36b95a1..126b9e5 100644 --- a/react-ui/src/global.less +++ b/react-ui/src/global.less @@ -98,7 +98,7 @@ body { } .ant-table-wrapper .ant-table-pagination.ant-pagination { margin: 0; - padding: 21px 16px; + padding: 20px 16px; background-color: #fff; } // .ant-table-wrapper .ant-table { @@ -190,32 +190,21 @@ body { .ant-modal .ant-modal-footer > .ant-btn + .ant-btn { margin-left: 20px; } -.ant-pagination .ant-pagination-item-active a { - color: #fff; - background: rgba(22, 100, 255, 0.8); - // color: #fff; - border-radius: 6px; +.ant-pagination .ant-pagination-item.ant-pagination-item-active { + background: @primary-color; + border-width: 0; + + a { + color: #fff; + } } .ant-pagination .ant-pagination-item-active:hover { - // color: #fff; - // background: rgba(22, 100, 255, 0.8); - // border-color: rgba(22, 100, 255, 0.8); - border-radius: 6px; + color: #fff; + background: rgba(22, 100, 255, 0.8); + border-color: rgba(22, 100, 255, 0.8); } .ant-pagination .ant-pagination-item { border: 1px solid #e6e6e6; - border-radius: 6px; -} - -.ant-tabs { - .ant-tabs-nav::before, - div > .ant-tabs-nav::before { - border: none; - } - - .ant-tabs-nav { - margin-bottom: 0; - } } // ::-webkit-scrollbar-button { diff --git a/react-ui/src/pages/Model/personalData.jsx b/react-ui/src/pages/Model/personalData.jsx index 2f08f14..fb47866 100644 --- a/react-ui/src/pages/Model/personalData.jsx +++ b/react-ui/src/pages/Model/personalData.jsx @@ -4,7 +4,7 @@ import creatByImg from '@/assets/img/creatBy.png'; import KFIcon from '@/components/KFIcon'; import { addModel, getAssetIcon, getModelList } from '@/services/dataset/index.js'; import { UploadOutlined } from '@ant-design/icons'; -import { Button, Form, Input, Modal, Pagination, Radio, Select, Upload } from 'antd'; +import { Button, Form, Input, Modal, Pagination, Select, Upload } from 'antd'; import moment from 'moment'; import { useEffect, useState } from 'react'; import { useNavigate } from 'react-router-dom'; @@ -106,6 +106,10 @@ const PublicData = () => { setIsModalOpen(false); }; const onFinish = (values) => { + const params = { + ...values, + available_range: 0, + }; addModel(values).then((ret) => { console.log(ret); getModelLists(queryFlow); @@ -379,12 +383,12 @@ const PublicData = () => { > - + {/* 仅自己可见 工作空间可见 - + */} { +const ModelMenus = ({ onParDragEnd }) => { const [modelMenusList, setModelMenusList] = useState([]); useEffect(() => { getComponentAll().then((ret) => { @@ -55,6 +55,7 @@ const modelMenus = ({ onParDragEnd }) => { {item.value && item.value.length > 0 ? item.value.map((ele) => (
{ dragEnd(e, ele); @@ -78,4 +79,4 @@ const modelMenus = ({ onParDragEnd }) => {
); }; -export default modelMenus; +export default ModelMenus; diff --git a/react-ui/src/pages/User/Login/index.tsx b/react-ui/src/pages/User/Login/index.tsx index 6aefa7a..6e04376 100644 --- a/react-ui/src/pages/User/Login/index.tsx +++ b/react-ui/src/pages/User/Login/index.tsx @@ -246,10 +246,10 @@ const Login: React.FC = () => { style={{ height: '42px', marginRight: '10px' }} alt="" /> - 复杂智能软件 + 智能软件开发平台
- 复杂智能软件 + 智能软件开发平台 {
hello~ 欢迎登陆 - 复杂智能软件 + 智能软件开发平台
Date: Wed, 24 Apr 2024 17:19:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=88=AB=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?Tag=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RuoYiManagementPlatformApplication.java | 4 +++- .../com/ruoyi/platform/domain/AssetIcon.java | 4 ++-- .../com/ruoyi/platform/domain/Dataset.java | 23 +++++++++++++++++++ .../java/com/ruoyi/platform/domain/Image.java | 2 +- .../ruoyi/platform/mapper/AssetIconDao.java | 1 + .../platform/service/AssetIconService.java | 9 ++++++++ .../service/impl/AssetIconServiceImpl.java | 9 +++++++- .../service/impl/DatasetServiceImpl.java | 17 +++++++++++++- .../service/impl/ImageServiceImpl.java | 1 + .../managementPlatform/AssetIconDaoMapper.xml | 8 +++++++ .../managementPlatform/DatasetDaoMapper.xml | 7 +++--- .../managementPlatform/ModelsDaoMapper.xml | 2 +- 12 files changed, 77 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/RuoYiManagementPlatformApplication.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/RuoYiManagementPlatformApplication.java index b3b22ac..9689cda 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/RuoYiManagementPlatformApplication.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/RuoYiManagementPlatformApplication.java @@ -17,7 +17,9 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableRyFeignClients @SpringBootApplication @EnableScheduling -public class RuoYiManagementPlatformApplication { +public class + +RuoYiManagementPlatformApplication { public static void main(String[] args) { SpringApplication.run(RuoYiManagementPlatformApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 复杂智能软件管理平台启动成功 ლ(´ڡ`ლ)ﾞ \n" + diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/AssetIcon.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/AssetIcon.java index 5cad60c..9e45034 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/AssetIcon.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/AssetIcon.java @@ -19,8 +19,8 @@ public class AssetIcon implements Serializable { /** * 主键 */ -@ApiModelProperty(value = "资产ID") -private Integer id; + @ApiModelProperty(value = "资产ID") + private Integer id; @ApiModelProperty(value = "资产图标名称") private String name; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java index f55cab1..1c49a7e 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java @@ -76,6 +76,13 @@ public class Dataset implements Serializable { @ApiModelProperty(value = "状态：0失效，1生效") private Integer state; + @ApiModelProperty(value = "数据集类型名字") + private String datasetTypeName; + + @ApiModelProperty(value = "数据集tag名字") + private String datasetTagName; + + public Integer getId() { return id; @@ -165,5 +172,21 @@ public class Dataset implements Serializable { this.state = state; } + public String getDatasetTypeName() { + return datasetTypeName; + } + + public String getDatasetTagName() { + return datasetTagName; + } + + public void setDatasetTagName(String datasetTagName) { + this.datasetTagName = datasetTagName; + } + + public void setDatasetTypeName(String datasetTypeName) { + this.datasetTypeName = datasetTypeName; + } + } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Image.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Image.java index 08c5463..981289a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Image.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Image.java @@ -118,7 +118,7 @@ public class Image implements Serializable { this.updateTime = updateTime; } - // Getter 和 Setter + public Integer getVersionCount() { return versionCount; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/AssetIconDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/AssetIconDao.java index 6e8fea2..d6379ae 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/AssetIconDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/AssetIconDao.java @@ -84,5 +84,6 @@ public interface AssetIconDao { List queryByCategoryId(Integer categoryId); + AssetIcon queryByPath(String path); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java index 3dd35a3..7aa8a4a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java @@ -22,6 +22,15 @@ public interface AssetIconService { */ AssetIcon queryById(Integer id); + + /** + * 通过path查询单条数据 + * + * @param path 路径 + * @return 实例对象 + */ + AssetIcon queryByPath(String path); + /** * 分页查询 * diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java index 2ba4d30..09610ce 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java @@ -2,7 +2,6 @@ package com.ruoyi.platform.service.impl; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.platform.domain.AssetIcon; -import com.ruoyi.platform.domain.Models; import com.ruoyi.platform.mapper.AssetIconDao; import com.ruoyi.platform.service.AssetIconService; import com.ruoyi.system.api.model.LoginUser; @@ -38,6 +37,12 @@ public class AssetIconServiceImpl implements AssetIconService { return this.assetIconDao.queryById(id); } + + @Override + public AssetIcon queryByPath(String path) { + return this.assetIconDao.queryByPath(path); + } + /** * 分页查询 * @@ -125,4 +130,6 @@ public class AssetIconServiceImpl implements AssetIconService { public List queryByCategoryId(Integer categoryId) { return this.assetIconDao.queryByCategoryId(categoryId); } + + } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java index 58487bd..1f27995 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java @@ -3,10 +3,12 @@ package com.ruoyi.platform.service.impl; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.platform.annotations.CheckDuplicate; +import com.ruoyi.platform.domain.AssetIcon; import com.ruoyi.platform.domain.Dataset; import com.ruoyi.platform.domain.DatasetVersion; import com.ruoyi.platform.mapper.DatasetDao; import com.ruoyi.platform.mapper.DatasetVersionDao; +import com.ruoyi.platform.service.AssetIconService; import com.ruoyi.platform.service.DatasetService; import com.ruoyi.platform.service.DatasetVersionService; import com.ruoyi.platform.service.MinioService; @@ -58,6 +60,9 @@ public class DatasetServiceImpl implements DatasetService { @Resource private DatasetVersionService datasetVersionService; + @Resource + private AssetIconService assetIconService; + @Resource private MinioService minioService; @@ -77,7 +82,17 @@ public class DatasetServiceImpl implements DatasetService { */ @Override public Dataset queryById(Integer id) { - return this.datasetDao.queryById(id); + + Dataset dataset = this.datasetDao.queryById(id); + String dataType = dataset.getDataType(); + String dataTag = dataset.getDataTag(); + //去资产管理表中查询对应的图标名 + AssetIcon dataTypeAssetIcon = assetIconService.queryByPath(dataType); + AssetIcon dataTagAssetIcon = assetIconService.queryByPath(dataTag); + dataset.setDatasetTypeName(dataTypeAssetIcon.getName()); + dataset.setDatasetTagName(dataTagAssetIcon.getName()); + return dataset; + } /** diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java index 7b4b777..76d510f 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java @@ -316,6 +316,7 @@ public class ImageServiceImpl implements ImageService { String filePath = "/data/argo-workflow/" + bucketName + "/" +path; String logs2 = k8sClientUtil.executeCommand(pod,"docker load -i "+filePath); // 在容器里执行 docker tag name:tag nexus3.kube-system.svc:8083/imageName:imageTag + if (StringUtils.isNoneBlank(logs2)){ String substring = logs2.substring(logs2.indexOf(":")+1).trim(); String tagCmd = "docker tag " + substring + " " + harborUrl + "/" + repository + "/" + username + "/" + imageName + ":" + imageTag; diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml index 21422c2..119c5fa 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml @@ -43,6 +43,13 @@ + + + insert into asset_icon(name, category_id, path, description, create_by, create_time, update_by, update_time, state) values (#{assetIcon.name}, #{assetIcon.categoryId}, #{assetIcon.path}, #{assetIcon.description}, #{assetIcon.createBy}, #{assetIcon.createTime}, #{assetIcon.updateBy}, #{assetIcon.updateTime}, #{assetIcon.state}) diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml index d7a0ec1..d4bae10 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml @@ -152,13 +152,13 @@ description = #{dataset.description}, - available_range = #{dataset.availableRange} - , + available_range = #{dataset.availableRange}, + data_type = #{dataset.dataType}, - data_tag = #{dataset.dataTag} + data_tag = #{dataset.dataTag}, create_by = #{dataset.createBy}, @@ -179,6 +179,7 @@ where id = #{dataset.id} + delete from dataset where id = #{id} diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml index 672f8a3..776cbba 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml @@ -154,7 +154,7 @@ description = #{models.description}, - available_range = #{models.availableRange} + available_range = #{models.availableRange}, model_type = #{models.modelType},