1
0

fix(web): 增加ware的归档信息格式

This commit is contained in:
2025-01-23 15:07:49 +08:00
parent 2ad3035f87
commit e167a4467d
3 changed files with 105 additions and 68 deletions

View File

@@ -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<Ware> {
);
}
@SneakyThrows
@Override
public void submit(Long id) {
User user = userService.currentLoginUser();
@@ -63,6 +67,7 @@ public class WareService extends CheckingService<Ware> {
MapUtil.<String, Object>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<Ware> {
@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

View File

@@ -202,6 +202,13 @@ public class AmisHelper {
);
}
public static ImmutableMap<Object, Object> tag(String value) {
return Maps.immutable.ofMap(MapUtil.builder()
.put("type", "tag")
.put("label", value)
.build());
}
public static ImmutableMap<Object, Object> editor(String language, String value) {
return Maps.immutable.ofMap(MapUtil.builder()
.put("disabled", true)