feat(web): 增加工单审批流结构

gringotts-frontend/components/constants.js

@@ -8,9 +8,13 @@ const information = {
 export function useAmis(amisObject) {
     document.title = information.title
     let amis = amisRequire('amis/embed')
+    let struct = amisObject(information)
+    if (information.debug) {
+        console.log(struct)
+    }
     amis.embed(
         '#app',
-        amisObject(information),
+        struct,
         {
             data: {
                 base: information.baseUrl,
@@ -171,12 +175,23 @@ export const userStateMapping = [
 ]
 
 export const confirmationStateMapping = [
+    mappingItem('未确权', 'NONE'),
     mappingItem('草稿', 'DRAFT', 'bg-primary'),
     mappingItem('审查中', 'CHECKING', 'bg-warning'),
     mappingItem('通过', 'NORMAL', 'bg-success'),
     mappingItem('驳回', 'REJECT', 'bg-danger'),
 ]
 
+export const checkTypeMapping = [
+    mappingItem('确权审查', 'CONFIRMATION', 'bg-blue-500'),
+    mappingItem('授权审查', 'AUTHENTICATION', 'bg-purple-500'),
+]
+
+export const checkOverMapping = [
+    mappingItem('完结', 'true', 'bg-success'),
+    mappingItem('进行中', 'false', 'bg-primary'),
+]
+
 function api(method, url) {
     return {
         method: method,
@@ -195,6 +210,21 @@ export function apiPost(url) {
     return api('post', url)
 }
 
+export function arrayInCheck(array, field) {
+    return `\${ARRAYINCLUDES(['${array.join("','")}'], ${field})}`
+}
+
+export function arrayOutCheck(array, field) {
+    return `\${!ARRAYINCLUDES(['${array.join("','")}'], ${field})}`
+}
+
+export const confirmationState = {
+    none: 'NONE',
+    draft: 'DRAFT',
+    checking: 'CHECKING',
+    normal: 'NORMAL',
+}
+
 export function roleCheck(roles) {
     return `\${ARRAYINCLUDES(['${roles.join("','")}'], role)}`
 }

gringotts-frontend/components/resource/dialog-resource.js

@@ -27,6 +27,8 @@ function detailForm(showCreatedUserAndModifiedUser = false) {
                 type: 'input-text',
                 name: 'name',
                 label: '资源名称',
+                maxLength: 10,
+                showCounter: true,
                 required: true,
                 ...formInputClearable,
             },

gringotts-frontend/pages/index/tab-check.js

@@ -1,4 +1,11 @@
-import {apiGet, apiPost, checkerOnly, crudCommonOptions} from "../../components/constants.js";
+import {
+    apiGet,
+    checkerOnly,
+    checkOverMapping,
+    checkTypeMapping,
+    crudCommonOptions,
+    mappingField
+} from "../../components/constants.js";
 import {permissionDetailDialog} from "../../components/permission/dialog-permission.js";
 
 export function tabCheck() {
@@ -6,19 +13,32 @@ export function tabCheck() {
         visibleOn: checkerOnly,
         title: '审核审查',
         icon: 'fa fa-shield-halved',
+        reload: true,
         body: [
             {
                 type: 'crud',
-                api: apiGet('${base}/check/list'),
+                api: apiGet('${base}/check_order/list'),
                 ...crudCommonOptions(),
                 headerToolbar: [
                     'reload',
                 ],
                 columns: [
                     {
-                        name: 'name',
+                        name: 'description',
                         label: '描述',
                     },
+                    {
+                        label: '类型',
+                        width: 80,
+                        align: 'center',
+                        ...mappingField('type', checkTypeMapping)
+                    },
+                    {
+                        label: '状态',
+                        width: 80,
+                        align: 'center',
+                        ...mappingField('over', checkOverMapping)
+                    },
                     {
                         label: '操作',
                         width: 100,
@@ -27,26 +47,25 @@ export function tabCheck() {
                         className: 'nowrap',
                         buttons: [
                             {
+                                visibleOn: '${!over}',
                                 type: 'action',
-                                label: '查看',
+                                label: '处理',
                                 level: 'link',
                                 ...permissionDetailDialog(
                                     'parameters.confirmationId',
                                     [
                                         {
-                                            type: 'each',
-                                            name: 'operations',
-                                            items: {
                                             type: 'action',
-                                                label: '${item.name}',
+                                            label: '同意',
-                                                level: '${item.level}',
                                             actionType: 'ajax',
-                                                api: {
+                                            api: apiGet('${base}/check_order/operation/${checkOrderId}/APPLY')
-                                                    ...apiPost('${base}/check/operation/${item.operation}'),
-                                                    data: '${parameters}'
-                                                }
-                                            }
                                         },
+                                        {
+                                            type: 'action',
+                                            label: '拒绝',
+                                            actionType: 'ajax',
+                                            api: apiGet('${base}/check_order/operation/${checkOrderId}/REJECT')
+                                        }
                                     ]
                                 ),
                             },

gringotts-frontend/pages/index/tab-data.js

@@ -3,7 +3,16 @@ import {
     resourceDetailDialog,
     resourceEditeDialog
 } from "../../components/resource/dialog-resource.js";
-import {apiGet, crudCommonOptions, userOnly} from "../../components/constants.js";
+import {
+    apiGet,
+    arrayInCheck,
+    arrayOutCheck,
+    confirmationState,
+    confirmationStateMapping,
+    crudCommonOptions,
+    mappingField,
+    userOnly
+} from "../../components/constants.js";
 
 export function resourceList() {
     return {
@@ -23,12 +32,18 @@ export function resourceList() {
             {
                 label: '名称',
                 name: 'name',
-                width: 200,
+                width: 150,
             },
             {
                 label: '描述',
                 name: 'description',
             },
+            {
+                label: '确权状态',
+                width: 80,
+                align: 'center',
+                ...mappingField('confirmationState', confirmationStateMapping)
+            },
             {
                 label: '创建时间',
                 width: 150,
@@ -57,14 +72,18 @@ export function resourceList() {
                         trigger: 'hover',
                         buttons: [
                             {
-                                disabledOn: '${confirmationId}',
+                                disabledOn: arrayOutCheck([confirmationState.none, confirmationState.draft], 'confirmationState'),
+                                disabledTip: '审查或确权成功后无法编辑',
+                                tooltipPlacement: 'top',
                                 type: 'action',
                                 label: '编辑',
                                 level: 'link',
                                 ...resourceEditeDialog(),
                             },
                             {
-                                disabledOn: '${confirmationId}',
+                                disabledOn: arrayInCheck([confirmationState.checking], 'confirmationState'),
+                                disabledTip: '审查中无法删除',
+                                tooltipPlacement: 'bottom',
                                 type: 'action',
                                 label: "删除",
                                 confirmTitle: '确认删除',
@@ -85,6 +104,7 @@ export function tabData() {
         visibleOn: userOnly,
         title: '数据资源',
         icon: 'fa fa-database',
+        reload: true,
         body: resourceList(),
     }
 }

gringotts-frontend/pages/index/tab-permissions.js

@@ -17,6 +17,7 @@ export function tabPermissions() {
         visibleOn: userOnly,
         title: '权属管理',
         icon: 'fa fa-user-shield',
+        reload: true,
         body: {
             type: 'tabs',
             tabs: [

gringotts-frontend/pages/index/tab-user.js

@@ -15,6 +15,7 @@ export function tabUser() {
         visibleOn: administratorOnly,
         title: '用户管理',
         icon: 'fa fa-user',
+        reload: true,
         body: [
             {
                 type: 'crud',

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/entity/Authentication.java

@@ -0,0 +1,92 @@
+package com.eshore.gringotts.web.domain.authentication.entity;
+
+import com.eshore.gringotts.core.Constants;
+import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
+import com.eshore.gringotts.web.domain.resource.entity.DataResource;
+import com.eshore.gringotts.web.domain.upload.entity.DataFile;
+import java.util.Set;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.ConstraintMode;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.ForeignKey;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedAttributeNode;
+import javax.persistence.NamedEntityGraph;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+/**
+ * 授权
+ *
+ * @author lanyuanxiaoyao
+ * @date 2024-11-29
+ */
+@Getter
+@Setter
+@ToString
+@Entity
+@DynamicUpdate
+@EntityListeners(AuditingEntityListener.class)
+@Table(name = Constants.TABLE_PREFIX + "authentication")
+@NamedEntityGraph(name = "authentication.list", attributeNodes = {
+        @NamedAttributeNode(value = "target"),
+        @NamedAttributeNode(value = "createdUser"),
+})
+@NamedEntityGraph(name = "authentication.detail", attributeNodes = {
+        @NamedAttributeNode(value = "target"),
+        @NamedAttributeNode(value = "evidences"),
+        @NamedAttributeNode(value = "createdUser"),
+        @NamedAttributeNode(value = "modifiedUser"),
+})
+public class Authentication extends SimpleEntity {
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    private DataResource target;
+    private String description;
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @JoinTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    @ToString.Exclude
+    private Set<DataFile> evidences;
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private State state = State.DRAFT;
+
+    public enum State {
+        /**
+         * 无确权
+         */
+        NONE,
+        /**
+         * 草稿
+         */
+        DRAFT,
+        /**
+         * 属主审查中
+         */
+        OWNER_CHECKING,
+        /**
+         * 审查中
+         */
+        CHECKING,
+        /**
+         * 正常
+         */
+        NORMAL,
+        /**
+         * 驳回
+         */
+        REJECT,
+    }
+}

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/SimpleEntity.java

@@ -24,7 +24,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
  */
 @Getter
 @Setter
-@ToString
+@ToString(callSuper = true)
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
 public class SimpleEntity extends IdOnlyEntity {

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/CheckingService.java

@@ -1,8 +1,6 @@
 package com.eshore.gringotts.web.domain.base.service;
 
-import lombok.Data;
+import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
-import lombok.Value;
-import org.eclipse.collections.api.list.ImmutableList;
 import org.eclipse.collections.api.map.ImmutableMap;
 
 /**
@@ -12,34 +10,5 @@ import org.eclipse.collections.api.map.ImmutableMap;
  * @date 2024-11-28
  */
 public interface CheckingService {
-    ImmutableList<CheckOrder> checkingList();
+    void onChecked(CheckOrder order, CheckOrder.Operation operation, ImmutableMap<String, Object> parameters);
-
-    void onChecked(String operation, ImmutableMap<String, Object> parameters);
-
-    @Value
-    class CheckOrder {
-        String name;
-        ImmutableList<CheckOperation> operations;
-        ImmutableMap<String, Object> parameters;
-    }
-
-    @Data
-    class CheckOperation {
-        /**
-         * 全局唯一
-         */
-        private final String operation;
-        private final String name;
-        private final String level;
-
-        public CheckOperation(String operation, String name) {
-            this(operation, name, "default");
-        }
-
-        public CheckOperation(String operation, String name, String level) {
-            this.operation = operation;
-            this.name = name;
-            this.level = level;
-        }
-    }
 }

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/controller/CheckController.java

@@ -1,20 +1,20 @@
 package com.eshore.gringotts.web.domain.check.controller;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.eshore.gringotts.web.configuration.amis.AmisResponse;
 import com.eshore.gringotts.web.domain.base.controller.ListController;
-import com.eshore.gringotts.web.domain.base.service.CheckingService;
+import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
+import com.eshore.gringotts.web.domain.check.service.CheckOrderService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.Data;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.collections.api.factory.Lists;
-import org.eclipse.collections.api.factory.Maps;
 import org.eclipse.collections.api.list.ImmutableList;
 import org.eclipse.collections.api.map.ImmutableMap;
-import org.eclipse.collections.api.map.MutableMap;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
-import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -26,36 +26,46 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Slf4j
 @RestController
-@RequestMapping("check")
+@RequestMapping("check_order")
-public class CheckController implements ListController<CheckingService.CheckOrder> {
+public class CheckController implements ListController<CheckController.ListItem> {
-    private final ImmutableList<CheckingService> checkingServices;
+    private final CheckOrderService checkOrderService;
-    private final MutableMap<String, CheckingService> serviceMap = Maps.mutable.<String, CheckingService>empty().asSynchronized();
+    private final ObjectMapper mapper;
 
-    public CheckController(ApplicationContext applicationContext) {
+    public CheckController(CheckOrderService checkOrderService, Jackson2ObjectMapperBuilder builder) {
-        this.checkingServices = Lists.immutable.ofAll(applicationContext.getBeansOfType(CheckingService.class).values());
+        this.checkOrderService = checkOrderService;
+        this.mapper = builder.build();
     }
 
     @GetMapping("/list")
     @Override
-    public AmisResponse<ImmutableList<CheckingService.CheckOrder>> list() throws Exception {
+    public AmisResponse<ImmutableList<CheckController.ListItem>> list() throws Exception {
-        return AmisResponse.responseSuccess(
+        return AmisResponse.responseSuccess(checkOrderService.list().collect(this::toListItem));
-                checkingServices.flatCollect(checkingService -> {
-                    ImmutableList<CheckingService.CheckOrder> orders = checkingService.checkingList();
-                    orders.flatCollect(CheckingService.CheckOrder::getOperations)
-                            .forEach(operation -> serviceMap.put(operation.getOperation(), checkingService));
-                    return orders;
-                })
-        );
     }
 
-    @PostMapping("/operation/{operation}")
+    @SneakyThrows
-    public AmisResponse<Object> operation(@PathVariable String operation, @RequestBody ImmutableMap<String, Object> data) {
+    private ListItem toListItem(CheckOrder order) {
-        log.info("Check operation: {} data: {} target: {}", operation, data, serviceMap.get(operation).getClass().getSimpleName());
+        ListItem item = new ListItem();
-        CheckingService service = serviceMap.getOrDefault(operation, null);
+        item.setCheckOrderId(order.getId());
-        if (ObjectUtil.isNull(service)) {
+        item.setDescription(order.getDescription());
-            throw new RuntimeException("服务未找到");
+        item.setType(order.getType());
+        item.setParameters(mapper.readValue(order.getParameters(), new TypeReference<>() {}));
+        item.setOver(order.getOver());
+        return item;
     }
-        service.onChecked(operation, data);
+
+    @GetMapping("/operation/{id}/{operation}")
+    public AmisResponse<Object> operation(@PathVariable Long id, @PathVariable CheckOrder.Operation operation) throws JsonProcessingException {
+        log.info("id:{}, operation:{}", id, operation);
+        checkOrderService.operation(id, operation);
         return AmisResponse.responseSuccess();
     }
+
+    @Data
+    public static final class ListItem {
+        private Long checkOrderId;
+        private String description;
+        private CheckOrder.Type type;
+        private ImmutableMap<String, Object> parameters;
+        private Boolean over;
+    }
 }

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/entity/CheckOrder.java

@@ -0,0 +1,122 @@
+package com.eshore.gringotts.web.domain.check.entity;
+
+import com.eshore.gringotts.core.Constants;
+import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
+import com.eshore.gringotts.web.domain.user.entity.User;
+import javax.persistence.Column;
+import javax.persistence.ConstraintMode;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.ForeignKey;
+import javax.persistence.JoinColumn;
+import javax.persistence.NamedAttributeNode;
+import javax.persistence.NamedEntityGraph;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+/**
+ * @author lanyuanxiaoyao
+ * @date 2024-11-29
+ */
+@Getter
+@Setter
+@ToString
+@Entity
+@DynamicUpdate
+@EntityListeners(AuditingEntityListener.class)
+@Table(name = Constants.TABLE_PREFIX + "check_order")
+@NamedEntityGraph(name = "check_order.list", attributeNodes = {
+        @NamedAttributeNode(value = "createdUser"),
+})
+@NamedEntityGraph(name = "check_order.detail", attributeNodes = {
+        @NamedAttributeNode(value = "createdUser"),
+        @NamedAttributeNode(value = "modifiedUser"),
+})
+@NoArgsConstructor
+public class CheckOrder extends SimpleEntity {
+    @Column(nullable = false)
+    private String key;
+    @Column(nullable = false)
+    private String description;
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private Type type;
+    /**
+     * JSON 结构 Map<String, Object>
+     */
+    @Column(nullable = false)
+    private String parameters;
+
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private Target target;
+    @Column(nullable = false)
+    private String targetClass;
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    @ToString.Exclude
+    private User targetUser;
+    @Enumerated(EnumType.STRING)
+    private User.Role targetRole;
+
+    @Column(nullable = false)
+    private Boolean over = false;
+
+    public CheckOrder(
+            String key,
+            String description,
+            Type type,
+            String parameters,
+            String targetClass,
+            User targetUser
+    ) {
+        this.key = key;
+        this.description = description;
+        this.type = type;
+        this.parameters = parameters;
+        this.target = Target.USER;
+        this.targetClass = targetClass;
+        this.targetUser = targetUser;
+    }
+
+    public CheckOrder(
+            String key,
+            String description,
+            Type type,
+            String parameters,
+            String targetClass,
+            User.Role targetRole
+    ) {
+        this.key = key;
+        this.description = description;
+        this.type = type;
+        this.parameters = parameters;
+        this.target = Target.ROLE;
+        this.targetClass = targetClass;
+        this.targetRole = targetRole;
+    }
+
+    public enum Operation {
+        APPLY,
+        REJECT,
+    }
+
+    public enum Type {
+        CONFIRMATION,
+        AUTHENTICATION,
+    }
+
+    public enum Target {
+        USER,
+        ROLE,
+    }
+}

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/repository/CheckOrderRepository.java

@@ -0,0 +1,39 @@
+package com.eshore.gringotts.web.domain.check.repository;
+
+import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
+import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
+import com.eshore.gringotts.web.domain.user.entity.User;
+import java.util.List;
+import java.util.Optional;
+import javax.transaction.Transactional;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author lanyuanxiaoyao
+ * @date 2024-11-29
+ */
+@SuppressWarnings("NullableProblems")
+@Repository
+public interface CheckOrderRepository extends SimpleRepository<CheckOrder, Long> {
+    @Override
+    @EntityGraph(value = "check_order.list", type = EntityGraph.EntityGraphType.FETCH)
+    List<CheckOrder> findAll(Specification<CheckOrder> specification);
+
+    @Override
+    @EntityGraph(value = "check_order.list", type = EntityGraph.EntityGraphType.FETCH)
+    List<CheckOrder> findAll(Specification<CheckOrder> specification, Sort sort);
+
+    @Override
+    @EntityGraph(value = "check_order.detail", type = EntityGraph.EntityGraphType.FETCH)
+    Optional<CheckOrder> findOne(Specification<CheckOrder> specification);
+
+    @Transactional
+    @Modifying
+    @Query("update CheckOrder check set check.over = true, check.modifiedUser = ?2, check.modifiedTime = current_timestamp where check.id = ?1")
+    void overById(Long id, User modifiedUser);
+}

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/service/CheckOrderService.java

@@ -0,0 +1,52 @@
+package com.eshore.gringotts.web.domain.check.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.eshore.gringotts.web.domain.base.service.CheckingService;
+import com.eshore.gringotts.web.domain.base.service.SimpleServiceSupport;
+import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
+import com.eshore.gringotts.web.domain.check.repository.CheckOrderRepository;
+import com.eshore.gringotts.web.domain.user.service.UserService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.collections.api.map.ImmutableMap;
+import org.springframework.context.ApplicationContext;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author lanyuanxiaoyao
+ * @date 2024-11-29
+ */
+@Slf4j
+@Service
+public class CheckOrderService extends SimpleServiceSupport<CheckOrder> {
+    private final ApplicationContext applicationContext;
+    private final ObjectMapper mapper;
+    private final CheckOrderRepository checkOrderRepository;
+    private final UserService userService;
+
+    public CheckOrderService(CheckOrderRepository repository, UserService userService, ApplicationContext applicationContext, Jackson2ObjectMapperBuilder builder) {
+        super(repository, userService);
+        this.applicationContext = applicationContext;
+        this.mapper = builder.build();
+        this.checkOrderRepository = repository;
+        this.userService = userService;
+    }
+
+    public void operation(Long id, CheckOrder.Operation operation) throws JsonProcessingException {
+        CheckOrder order = detailOrThrow(id);
+        CheckingService service = applicationContext.getBean(order.getTargetClass(), CheckingService.class);
+        if (ObjectUtil.isNull(service)) {
+            throw new RuntimeException(StrUtil.format("名为「{}」的服务未找到", order.getTargetClass()));
+        }
+        ImmutableMap<String, Object> parameters = mapper.readValue(order.getParameters(), new TypeReference<>() {});
+        service.onChecked(order, operation, parameters);
+    }
+
+    public void over(Long id) {
+        checkOrderRepository.overById(id, userService.currentLoginUser());
+    }
+}

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/controller/ConfirmationController.java

@@ -9,6 +9,7 @@ import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
 import com.eshore.gringotts.web.domain.confirmation.service.ConfirmationService;
 import com.eshore.gringotts.web.domain.resource.service.DataResourceService;
 import com.eshore.gringotts.web.domain.upload.service.DataFileService;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -40,7 +41,7 @@ public class ConfirmationController extends SimpleControllerSupport<Confirmation
     }
 
     @GetMapping("/submit/{id}")
-    public AmisResponse<Object> submit(@PathVariable Long id) {
+    public AmisResponse<Object> submit(@PathVariable Long id) throws JsonProcessingException {
         confirmationService.submit(id);
         return AmisResponse.responseSuccess();
     }

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/entity/Confirmation.java

@@ -35,7 +35,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
  */
 @Getter
 @Setter
-@ToString
+@ToString(callSuper = true)
 @Entity
 @DynamicUpdate
 @EntityListeners(AuditingEntityListener.class)
@@ -64,6 +64,10 @@ public class Confirmation extends SimpleEntity {
     private State state = State.DRAFT;
 
     public enum State {
+        /**
+         * 无确权
+         */
+        NONE,
         /**
          * 草稿
          */

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/service/ConfirmationService.java

@@ -4,14 +4,19 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.eshore.gringotts.web.domain.base.service.CheckingService;
 import com.eshore.gringotts.web.domain.base.service.SimpleServiceSupport;
+import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
+import com.eshore.gringotts.web.domain.check.service.CheckOrderService;
 import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
 import com.eshore.gringotts.web.domain.confirmation.repository.ConfirmationRepository;
+import com.eshore.gringotts.web.domain.user.entity.User;
 import com.eshore.gringotts.web.domain.user.service.UserService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import javax.transaction.Transactional;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.factory.Maps;
-import org.eclipse.collections.api.list.ImmutableList;
 import org.eclipse.collections.api.map.ImmutableMap;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.stereotype.Service;
 
 /**
@@ -19,15 +24,19 @@ import org.springframework.stereotype.Service;
  * @date 2024-11-26
  */
 @Slf4j
-@Service
+@Service("com.eshore.gringotts.web.domain.confirmation.service.ConfirmationService")
 public class ConfirmationService extends SimpleServiceSupport<Confirmation> implements CheckingService {
     private final ConfirmationRepository confirmationRepository;
     private final UserService userService;
+    private final CheckOrderService checkOrderService;
+    private final ObjectMapper mapper;
 
-    public ConfirmationService(ConfirmationRepository confirmationRepository, UserService userService) {
+    public ConfirmationService(ConfirmationRepository confirmationRepository, UserService userService, CheckOrderService checkOrderService, Jackson2ObjectMapperBuilder builder) {
         super(confirmationRepository, userService);
         this.confirmationRepository = confirmationRepository;
         this.userService = userService;
+        this.checkOrderService = checkOrderService;
+        this.mapper = builder.build();
     }
 
     @Override
@@ -38,8 +47,20 @@ public class ConfirmationService extends SimpleServiceSupport<Confirmation> impl
         return super.save(entity);
     }
 
-    public void submit(Long id) {
+    @Transactional(rollbackOn = Throwable.class)
-        confirmationRepository.updateStateById(id, Confirmation.State.CHECKING, userService.currentLoginUser());
+    public void submit(Long id) throws JsonProcessingException {
+        Confirmation confirmation = detailOrThrow(id);
+        log.info("confirmation: {}", confirmation);
+        confirmation.setState(Confirmation.State.CHECKING);
+        checkOrderService.save(new CheckOrder(
+                "confirmation_check",
+                StrUtil.format("数据资源「{}」的确权申请", confirmation.getTarget().getName()),
+                CheckOrder.Type.CONFIRMATION,
+                mapper.writeValueAsString(Maps.immutable.of("confirmationId", confirmation.getId())),
+                "com.eshore.gringotts.web.domain.confirmation.service.ConfirmationService",
+                User.Role.ADMINISTRATOR
+        ));
+        save(confirmation);
     }
 
     public void retract(Long id) {
@@ -47,34 +68,21 @@ public class ConfirmationService extends SimpleServiceSupport<Confirmation> impl
     }
 
     @Override
-    public ImmutableList<CheckOrder> checkingList() {
+    public void onChecked(CheckOrder order, CheckOrder.Operation operation, ImmutableMap<String, Object> parameters) {
-        return Lists.immutable.ofAll(
+        if (StrUtil.equals(order.getKey(), "confirmation_check")) {
-                        confirmationRepository.findAll(
-                                (root, query, builder) -> builder.equal(root.get("state"), Confirmation.State.CHECKING)
-                        )
-                )
-                .collect(confirmation -> new CheckOrder(
-                        StrUtil.format("资源名为「{}」的确权申请", confirmation.getTarget().getName()),
-                        Lists.immutable.of(
-                                new CheckOperation("confirmation_check_apply", "通过"),
-                                new CheckOperation("confirmation_check_reject", "拒绝", "danger")
-                        ),
-                        Maps.immutable.of("confirmationId", confirmation.getId())
-                ));
-    }
-
-    @Override
-    public void onChecked(String operation, ImmutableMap<String, Object> parameters) {
             Long id = (Long) parameters.get("confirmationId");
             switch (operation) {
-            case "confirmation_check_apply":
+                case APPLY:
                     confirmationRepository.updateStateById(id, Confirmation.State.NORMAL, userService.currentLoginUser());
+                    checkOrderService.over(order.getId());
                     break;
-            case "confirmation_check_reject":
+                case REJECT:
                     confirmationRepository.updateStateById(id, Confirmation.State.DRAFT, userService.currentLoginUser());
+                    checkOrderService.over(order.getId());
                     break;
             }
         }
+    }
 
     public static final class ConfirmationDuplicatedException extends RuntimeException {
         public ConfirmationDuplicatedException() {

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/controller/DataResourceController.java

@@ -6,6 +6,7 @@ import com.eshore.gringotts.web.domain.base.controller.SimpleControllerSupport;
 import com.eshore.gringotts.web.domain.base.entity.FileInfo;
 import com.eshore.gringotts.web.domain.base.entity.SimpleListItem;
 import com.eshore.gringotts.web.domain.base.entity.SimpleSaveItem;
+import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
 import com.eshore.gringotts.web.domain.resource.entity.DataResource;
 import com.eshore.gringotts.web.domain.resource.entity.format.CsvResourceFormat;
 import com.eshore.gringotts.web.domain.resource.entity.format.JsonLineResourceFormat;
@@ -78,6 +79,9 @@ public class DataResourceController extends SimpleControllerSupport<DataResource
         item.setFormat(dataResource.getFormat().getFormatType().name());
         if (ObjectUtil.isNotNull(dataResource.getConfirmation())) {
             item.setConfirmationId(dataResource.getConfirmation().getId());
+            item.setConfirmationState(dataResource.getConfirmation().getState());
+        } else {
+            item.setConfirmationState(Confirmation.State.NONE);
         }
         item.setCreatedUser(dataResource.getCreatedUser().getUsername());
         item.setCreatedTime(dataResource.getCreatedTime());
@@ -250,6 +254,7 @@ public class DataResourceController extends SimpleControllerSupport<DataResource
         private String type;
         private String format;
         private Long confirmationId;
+        private Confirmation.State confirmationState;
         private String createdUser;
         private LocalDateTime createdTime;
     }

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/DataResource.java

@@ -1,11 +1,13 @@
 package com.eshore.gringotts.web.domain.resource.entity;
 
 import com.eshore.gringotts.core.Constants;
+import com.eshore.gringotts.web.domain.authentication.entity.Authentication;
 import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
 import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
 import com.eshore.gringotts.web.domain.resource.entity.format.ResourceFormat;
 import com.eshore.gringotts.web.domain.resource.entity.type.ResourceType;
 import com.eshore.gringotts.web.domain.upload.entity.DataFile;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.ConstraintMode;
@@ -16,6 +18,7 @@ import javax.persistence.ForeignKey;
 import javax.persistence.JoinColumn;
 import javax.persistence.NamedAttributeNode;
 import javax.persistence.NamedEntityGraph;
+import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import lombok.Getter;
@@ -26,7 +29,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 @Getter
 @Setter
-@ToString
+@ToString(callSuper = true)
 @Entity
 @EntityListeners(AuditingEntityListener.class)
 @DynamicUpdate
@@ -64,4 +67,7 @@ public class DataResource extends SimpleEntity {
     @OneToOne(cascade = CascadeType.REMOVE, fetch = FetchType.EAGER, mappedBy = "target")
     @ToString.Exclude
     private Confirmation confirmation;
+    @OneToMany(cascade = CascadeType.REMOVE, fetch = FetchType.EAGER, mappedBy = "target")
+    @ToString.Exclude
+    private Set<Authentication> authentications;
 }