diff --git a/gringotts-frontend/pages/test/main.js b/gringotts-frontend/pages/test/main.js index 03b4f91..507cd4e 100644 --- a/gringotts-frontend/pages/test/main.js +++ b/gringotts-frontend/pages/test/main.js @@ -3,88 +3,96 @@ import {useAmis} from "../../components/constants.js"; useAmis((information) => { return { "type": "wrapper", - "size": "none", "body": [ + { + "type": "property", + "items": [ + { + "content": "API资源", + "label": "名称" + }, + { + "label": "标签", + "span": 2, + "content": [ + { + "type": "tag", + "label": "API" + } + ] + }, + { + "label": "简介", + "span": 3, + "content": "API 资源" + }, + { + "span": 3, + "content": "

这是API资源

", + "label": "内容" + }, + ], + "title": "商品信息" + }, + { + "type": "divider" + }, { "type": "wrapper", "body": [ { + "type": "property", "items": [ { "label": "资源名称", "span": 3, - "content": "文件资源" - }, - { - "content": "FIle", - "span": 3, - "label": "资源描述" - } - ], - "type": "property" - }, - { - "type": "divider" - }, - { - "title": "资源类型定义", - "type": "property", - "items": [ - { - "span": 3, - "label": "资源类型", - "content": "文件" + "content": "API资源" }, { "span": 3, - "content": { - "type": "flex", - "alignItems": "start", - "items": [ - { - "label": "arthas-bin.zip", - "api": { - "method": "get", - "url": "${base}/upload/download/3557040775256064", - "headers": { - "token": "${token|default:undefined}" - }, - "responseType": "blob" - }, - "actionType": "ajax", - "type": "action", - "level": "link" - } - ], - "direction": "column" - }, - "label": "文件" - }, - { - label: '格式详情', - content: { - type: 'editor', - language: 'json', - value: { - "name": "arthas-bin.zip", - "size": 1024, - "type": "application/zip", - "lastModified": 1673920000000, - "lastModifiedDate": "2023-01-14T14:40:00.000Z", - "webkitRelativePath": "" - } - }, + "label": "资源描述", + "content": "这是API资源" } ] }, { "type": "divider" }, + { + "items": [ + { + "span": 3, + "content": "API", + "label": "资源类型" + }, + { + "span": 1, + "content": "administrator@eshore.com", + "label": "用户名" + }, + { + "label": "密码", + "content": "bLiN+,qAss,uo'nxoH_:d@HEdD*WdZWAudq$J'a$5Z#aS>K-*dWN5L-i { "type": "divider" }, { + "type": "property", "items": [ { "label": "创建人", @@ -104,8 +113,8 @@ useAmis((information) => { "content": "administrator@eshore.com" }, { - "content": "2025-01-14 14:41:56", - "label": "创建时间" + "label": "创建时间", + "content": "2025-01-23 14:24:15" }, { "span": 2, @@ -113,12 +122,12 @@ useAmis((information) => { "label": "修改人" }, { - "content": "2025-01-14 14:41:56", - "label": "修改时间" + "label": "修改时间", + "content": "2025-01-23 14:24:15" } - ], - "type": "property" + ] } - ] + ], + "size": "none" } }) diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/WareService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/WareService.java index 6d48312..52a1ebd 100644 --- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/WareService.java +++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/WareService.java @@ -2,10 +2,12 @@ package com.eshore.gringotts.web.domain.service; import cn.hutool.core.map.MapUtil; import com.eshore.gringotts.web.domain.base.service.CheckingService; +import com.eshore.gringotts.web.domain.entity.DataResource; import com.eshore.gringotts.web.domain.entity.User; import com.eshore.gringotts.web.domain.entity.Ware; import com.eshore.gringotts.web.domain.flowable.UserAssessor; import com.eshore.gringotts.web.domain.repository.WareRepository; +import com.eshore.gringotts.web.helper.AmisHelper; import com.lanyuanxiaoyao.flowable.core.model.FlowableAction; import com.lanyuanxiaoyao.flowable.core.model.FlowableInstance; import com.lanyuanxiaoyao.flowable.core.model.FlowableListener; @@ -13,6 +15,7 @@ import com.lanyuanxiaoyao.flowable.core.model.FlowableMetadata; import com.lanyuanxiaoyao.flowable.core.model.FlowableNode; import com.lanyuanxiaoyao.flowable.jpa.SpringFlowableManager; import javax.persistence.EntityManager; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; @@ -54,6 +57,7 @@ public class WareService extends CheckingService { ); } + @SneakyThrows @Override public void submit(Long id) { User user = userService.currentLoginUser(); @@ -63,6 +67,7 @@ public class WareService extends CheckingService { MapUtil.builder() .put("wareId", id) .put("type", "WARE") + .put("snapshot", archive(ware)) .put("createdUsername", user.getUsername()) .put("modifiedUsername", user.getUsername()) .put(UserAssessor.KEY, ware.getResource().getCreatedUser().getId()) @@ -81,7 +86,23 @@ public class WareService extends CheckingService { @Override protected Object archive(Ware entity) { - return ""; + DataResource resource = entity.getResource(); + return AmisHelper.wrapper( + AmisHelper.property( + "商品信息", + AmisHelper.propertyItem("名称", entity.getName()), + AmisHelper.propertyItem( + "标签", + Lists.immutable.ofAll(entity.getTags()).collect(AmisHelper::tag) + ), + AmisHelper.propertyItem("简介", entity.getDescription(), 3), + AmisHelper.propertyItem("内容", entity.getContent(), 3) + ), + AmisHelper.divider(), + AmisHelper.property(resource), + AmisHelper.divider(), + AmisHelper.property(entity) + ); } @Component diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/helper/AmisHelper.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/helper/AmisHelper.java index 703ae30..6873a5f 100644 --- a/gringotts-web/src/main/java/com/eshore/gringotts/web/helper/AmisHelper.java +++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/helper/AmisHelper.java @@ -202,6 +202,13 @@ public class AmisHelper { ); } + public static ImmutableMap tag(String value) { + return Maps.immutable.ofMap(MapUtil.builder() + .put("type", "tag") + .put("label", value) + .build()); + } + public static ImmutableMap editor(String language, String value) { return Maps.immutable.ofMap(MapUtil.builder() .put("disabled", true)