feat(web): 优化代码分层

- 修改了 visibleOn 属性的字符串格式，统一使用双引号
- 移除了不必要的反引号，简化了字符串表达式

gringotts-frontend/components/constants.js

@@ -1,6 +1,6 @@
 export const information = {
-  debug: true,
+  debug: import.meta.env.DEV,
-  baseUrl: 'http://127.0.0.1:20080',
+  baseUrl: import.meta.env.DEV ? 'http://127.0.0.1:20080' : '',
   title: '可信供给中心',
 }
 
@@ -16,8 +16,8 @@ export function useAmis(amisObject) {
     struct,
     {
       data: {
-        debug: information.debug ?? false,
+        debug: information.debug,
-        base: information.baseUrl ?? '',
+        base: information.baseUrl,
       },
     },
     {

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

@@ -99,6 +99,16 @@ function detailForm() {
         trimContents: true,
         minRows: 2,
         maxRows: 2,
+        maxLength: 100,
+      },
+      {
+        type: 'input-tag',
+        name: 'tags',
+        label: '标签',
+        max: 10,
+        maxTagLength: 10,
+        joinValues: false,
+        extractValue: true,
       },
       {
         type: 'input-rich-text',

gringotts-frontend/pages/index/main.js

@@ -1,14 +1,14 @@
 import './style.css'
-import {apiGet, useAmis} from '../../components/constants.js'
+import {administratorOnly, apiGet, checkerOnly, useAmis, userOnly} from '../../components/constants.js'
-import {userChangePasswordDialog} from "../../components/user/dialog-user-change-password.js";
+import {userChangePasswordDialog} from '../../components/user/dialog-user-change-password.js'
-import {tabUser} from "./tab-user.js";
+import {tabUser} from './tab-user.js'
-import {tabData} from "./tab-data.js";
+import {tabData} from './tab-data.js'
-import {tabSettings} from "./tab-settings.js";
+import {tabSettings} from './tab-settings.js'
-import {tabCheck} from "./tab-check.js";
+import {tabCheck} from './tab-check.js'
-import {tabPermissions} from "./tab-permissions.js";
+import {tabPermissions} from './tab-permissions.js'
-import {tabMarket} from "./tab-market.js";
+import {tabMarket} from './tab-market.js'
 
-useAmis(information => {
+useAmis((information) => {
   return {
     id: 'header-service',
     className: 'h-full',
@@ -23,22 +23,105 @@ useAmis(information => {
             args: {
               url: '/pages/login/index.html',
               blank: false,
+            },
+          },
+        ],
+      },
+    },
+    body: [
+      {
+        id: 'root-page',
+        type: 'page',
+        title: {
+          type: 'flex',
+          justify: 'flex-start',
+          items: [
+            {
+              type: 'avatar',
+              className: 'mr-2 bg-transparent',
+              src: '/logo.svg',
+              shape: 'square',
+              fit: 'contain',
+            },
+            {
+              type: 'flex',
+              className: 'w-50',
+              direction: 'column',
+              items: [
+                {
+                  type: 'tpl',
+                  className: 'font-bold text-white',
+                  tpl: information.title,
+                },
+                {
+                  type: 'tpl',
+                  className: 'font-bold text-xs text-gray-200',
+                  tpl: '提供合法合规的数据要素可信供给工具',
+                },
+              ]
+            }
+          ]
+        },
+        // subTitle: '提供合法合规的数据要素可信供给工具',
+        headerClassName: 'bg-gray-800 text-white',
+        toolbarClassName: 'bg-gray-800',
+        toolbar: [
+          {
+            type: 'action',
+            label: '数据市场',
+            icon: 'fa fa-store',
+            level: 'link',
+            className: "text-bold ${IF(activePage === 'market', 'text-primary', 'text-white')}",
+            onEvent: {
+              click: {
+                actions: [
+                  {
+                    actionType: 'setValue',
+                    componentId: 'root-page',
+                    args: {
+                      value: {
+                        activePage: 'market',
+                      }
                     }
                   }
                 ]
               }
+            }
           },
-    body: [
           {
-        type: 'page',
+            type: 'action',
-        title: information.title,
+            label: '我的资源',
-        subTitle: '提供合法合规的数据要素可信供给工具',
+            icon: 'fa fa-database',
-        toolbar: [
+            level: 'link',
+            className: "text-bold ${IF(activePage === 'tab', 'text-primary', 'text-white')}",
+            onEvent: {
+              click: {
+                actions: [
+                  {
+                    actionType: 'setValue',
+                    componentId: 'root-page',
+                    args: {
+                      value: {
+                        activePage: 'tab',
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          {
+            type: 'divider',
+            direction: 'vertical',
+            color: '#4d4d4d',
+          },
           {
             type: 'dropdown-button',
             label: '${username}',
             align: 'right',
             trigger: 'hover',
+            btnClassName: 'text-white',
+            level: 'link',
             buttons: [
               {
                 label: '修改密码',
@@ -49,26 +132,69 @@ useAmis(information => {
                 actionType: 'ajax',
                 api: apiGet('${base}/user/logout'),
                 reload: 'header-service',
-              }
+              },
-            ]
+            ],
-          }
+          },
         ],
         bodyClassName: 'p-0',
-        body: {
+        data: {
+          activePage: 'tab',
+          tabActiveKey: 'data'
+        },
+        body: [
+          {
+            visibleOn: "${activePage === 'market'}",
+            type: 'wrapper',
+            body: tabMarket(),
+          },
+          {
+            visibleOn: "${activePage === 'tab'}",
             className: 'h-full border-0',
             type: 'tabs',
             tabsMode: 'vertical',
+            activeKey: '${tabActiveKey}',
             tabs: [
               // tabOverview(),
-            tabMarket(),
+              {
-            tabData(),
+                hash: 'data',
-            tabPermissions(),
+                visibleOn: userOnly,
-            tabCheck(),
+                title: '数据资源',
-            tabUser(),
+                icon: 'fa fa-database',
-            tabSettings(),
+                reload: true,
-          ]
+                body: tabData()
               },
+              {
+                hash: 'permission',
+                visibleOn: userOnly,
+                title: '权属管理',
+                icon: 'fa fa-key',
+                reload: true,
+                body: tabPermissions(),
+              },
+              {
+                hash: 'check',
+                visibleOn: checkerOnly,
+                title: '审核审查',
+                icon: 'fa fa-shield-halved',
+                reload: true,
+                body: tabCheck(),
+              },
+              {
+                hash: 'user',
+                visibleOn: administratorOnly,
+                title: '用户管理',
+                icon: 'fa fa-user',
+                reload: true,
+                body: tabUser(),
+              },
+              {
+                hash: 'settings',
+                ...tabSettings(),
               }
-    ]
+            ],
+          }
+        ],
+      },
+    ],
   }
 })

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

@@ -1,6 +1,5 @@
 import {
   apiGet,
-  checkerOnly,
   checkOverMapping,
   checkTypeMapping,
   crudCommonOptions,
@@ -13,12 +12,7 @@ import {authenticationDetailDialog, confirmationDetailDialog} from "../../compon
 import {wareDetailDialog} from "../../components/ware/dialog-ware.js";
 
 export function tabCheck() {
-  return {
+  return [
-    visibleOn: checkerOnly,
-    title: '审核审查',
-    icon: 'fa fa-shield-halved',
-    reload: true,
-    body: [
     {
       name: 'check_order_list',
       type: 'crud',
@@ -37,7 +31,7 @@ export function tabCheck() {
         stringField('modifiedUsername', '最后操作人', 100),
         operationField('操作', undefined, [
           {
-              visibleOn: `\${type === 'CONFIRMATION' && state === 'CHECKING'}`,
+            visibleOn: "${type === 'CONFIRMATION' && state === 'CHECKING'}",
             type: 'action',
             label: '处理',
             level: 'link',
@@ -64,14 +58,14 @@ export function tabCheck() {
             ),
           },
           {
-              visibleOn: `\${type === 'CONFIRMATION' && state !== NORMAL}`,
+            visibleOn: "${type === 'CONFIRMATION' && state !== NORMAL}",
             type: 'action',
             label: '查看',
             level: 'link',
             ...confirmationDetailDialog('parameters.confirmationId'),
           },
           {
-              visibleOn: `\${type === 'AUTHENTICATION' && state === 'CHECKING'}`,
+            visibleOn: "${type === 'AUTHENTICATION' && state === 'CHECKING'}",
             type: 'action',
             label: '处理',
             level: 'link',
@@ -98,14 +92,14 @@ export function tabCheck() {
             ),
           },
           {
-              visibleOn: `\${type === 'AUTHENTICATION' && state !== NORMAL}`,
+            visibleOn: "${type === 'AUTHENTICATION' && state !== NORMAL}",
             type: 'action',
             label: '查看',
             level: 'link',
             ...authenticationDetailDialog('parameters.authenticationId'),
           },
           {
-              visibleOn: `\${type === 'MARKET' && state === 'CHECKING'}`,
+            visibleOn: "${type === 'MARKET' && state === 'CHECKING'}",
             type: 'action',
             label: '处理',
             level: 'link',
@@ -132,7 +126,7 @@ export function tabCheck() {
             ),
           },
           {
-              visibleOn: `\${type === 'MARKET' && state !== NORMAL}`,
+            visibleOn: "${type === 'MARKET' && state !== NORMAL}",
             type: 'action',
             label: '查看',
             level: 'link',
@@ -141,6 +135,5 @@ export function tabCheck() {
         ]),
       ],
     },
-    ],
+  ]
-  }
 }

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

@@ -11,8 +11,7 @@ import {
   mappingField,
   operationField,
   permissionStateMapping,
-  timeField,
+  timeField
-  userOnly
 } from "../../components/constants.js";
 import {wareAddDialog, wareDetailDialog, wareEditeDialog} from "../../components/ware/dialog-ware.js";
 
@@ -86,11 +85,6 @@ export function resourceList(showMode = false) {
 
 export function tabData() {
   return {
-    visibleOn: userOnly,
-    title: '数据资源',
-    icon: 'fa fa-database',
-    reload: true,
-    body: {
     type: 'tabs',
     tabs: [
       {
@@ -121,6 +115,8 @@ export function tabData() {
             {
               name: 'description',
               label: '描述',
+              type: 'tpl',
+              tpl: '${TRUNCATE(description, 100)}',
             },
             mappingField('state', '状态', permissionStateMapping),
             timeField('createdTime', '创建时间'),
@@ -182,5 +178,4 @@ export function tabData() {
       }
     ]
   }
-  }
 }

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

@@ -3,10 +3,6 @@ import {authenticationAddDialog} from "../../components/permission/dialog-permis
 
 export function tabMarket() {
   return {
-    title: '数据市场',
-    icon: 'fa fa-store',
-    reload: true,
-    body: {
     type: 'crud',
     api: {
       ...apiGet('${base}/ware/list_public'),
@@ -84,7 +80,6 @@ export function tabMarket() {
           ...authenticationAddDialog(),
         }
       ]
-      },
     }
   }
 }

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

@@ -12,7 +12,6 @@ import {
   stringField,
   stringWrapField,
   timeField,
-  userOnly,
 } from "../../components/constants.js";
 import {
   authenticationAddDialog,
@@ -25,11 +24,6 @@ import {
 
 export function tabPermissions() {
   return {
-    visibleOn: userOnly,
-    title: '权属管理',
-    icon: 'fa fa-key',
-    reload: true,
-    body: {
     type: 'tabs',
     tabs: [
       {
@@ -192,5 +186,4 @@ export function tabPermissions() {
       },
     ]
   }
-  }
 }

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

@@ -1,5 +1,4 @@
 import {
-  administratorOnly,
   apiGet,
   copyField,
   crudCommonOptions,
@@ -13,12 +12,7 @@ import {userCheckDialog, userDetailDialog} from "../../components/user/dialog-us
 import {userAdministratorRegisterDialog} from "../../components/user/dialog-user-register.js";
 
 export function tabUser() {
-  return {
+  return [
-    visibleOn: administratorOnly,
-    title: '用户管理',
-    icon: 'fa fa-user',
-    reload: true,
-    body: [
     {
       type: 'crud',
       api: apiGet('${base}/user_management/list'),
@@ -79,5 +73,4 @@ export function tabUser() {
       ]
     }
   ]
-  }
 }

gringotts-frontend/pages/login/main.js

@@ -4,74 +4,103 @@ import {userRegisterDialog} from '../../components/user/dialog-user-register.js'
 useAmis(information => {
     return {
         type: 'page',
-        title: information.title,
+        className: 'h-screen bg-gray-900',
-        subTitle: '统一登陆入口',
+        bodyClassName: 'h-full flex items-start mt-20',
         body: [
             {
-                type: 'grid',
+                type: 'wrapper',
-                columns: [
+                className: 'relative w-full max-w-md mx-auto',
+                body: [
                     {
-                        xs: 0,
+                        type: 'flex',
-                        sm: 0,
+                        justify: 'center',
-                        md: 4,
+                        className: 'mb-8',
-                        body: [],
+                        items: [
+                            {
+                                type: 'avatar',
+                                src: '/logo.svg',
+                                shape: 'square',
+                                size: 64,
+                                fit: 'contain',
+                                className: 'mr-4 bg-transparent'
                             },
                             {
-                        xs: 12,
+                                type: 'flex',
-                        sm: 12,
+                                direction: 'column',
-                        md: 4,
+                                justify: 'center',
-                        body: [
+                                items: [
+                                    {
+                                        type: 'tpl',
+                                        tpl: information.title,
+                                        className: 'text-2xl font-bold text-white'
+                                    },
+                                    {
+                                        type: 'tpl',
+                                        tpl: '统一登录入口',
+                                        className: 'text-lg ml-1 mt-1 text-gray-100'
+                                    }
+                                ]
+                            }
+                        ]
+                    },
                     {
                         type: 'form',
-                                title: '用户登陆',
+                        className: 'bg-white rounded-xl p-10 shadow-2xl',
                         api: '${base}/user/login',
                         redirect: '/pages/index/index.html?token=${token}',
-                                mode: 'horizontal',
+                        mode: 'normal',
-                                horizontal: {
+                        wrapWithPanel: false,
-                                    left: 2,
-                                },
-                                actions: [
-                                    {
-                                        type: 'action',
-                                        label: '注册',
-                                        ...userRegisterDialog(),
-                                    },
-                                    {
-                                        type: 'action',
-                                        actionType: 'submit',
-                                        label: '登陆',
-                                        level: 'primary',
-                                    },
-                                ],
                         body: [
                             {
                                 type: 'input-email',
                                 name: 'username',
-                                        label: '邮箱',
+                                label: false,
                                 placeholder: '请输入邮箱',
                                 required: true,
                                 clearable: true,
-                                        clearValueOnEmpty: true,
+                                className: 'mb-4',
+                                inputClassName: 'rounded-lg',
                             },
                             {
                                 type: 'input-password',
                                 name: 'password',
-                                        label: '密码',
+                                label: false,
-                                        placeholder: '请再次输入密码',
+                                placeholder: '请输入密码',
                                 required: true,
-                                    },
+                                className: 'mb-4',
-                                ],
+                                inputClassName: 'rounded-lg',
-                            },
-                        ],
                             },
                             {
-                        xs: 0,
+                                type: 'flex',
-                        sm: 0,
+                                justify: 'space-between',
-                        md: 4,
+                                className: 'mb-4',
-                        body: [],
+                                items: [
+                                    {
+                                        type: 'button',
+                                        label: '注册账号',
+                                        className: 'text-blue-600 hover:text-blue-700',
+                                        level: 'link',
+                                        ...userRegisterDialog(),
                                     },
-                ],
+                                    {
+                                        type: 'button',
+                                        label: '忘记密码？',
+                                        level: 'link',
+                                        className: 'text-gray-600 hover:text-gray-700'
+                                    }
+                                ]
                             },
-        ],
+                            {
+                                type: 'submit',
+                                label: '登录',
+                                level: 'primary',
+                                className: 'w-full rounded-lg',
+                                size: 'lg'
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
     }
 })

gringotts-frontend/public/logo.svg

@@ -0,0 +1,8 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1589 1540" width="1589" height="1540">
+    <title>China_Telecom_Logo-svg</title>
+    <style>
+        .s0 { fill: #FFFFFF }
+    </style>
+    <path id="path8564" class="s0"
+          d="m1004.4 258.8c0 0-27.8-30.7-64.4-30.7 0 0-80.2 0-134.7 173.4 0 0-46.5 151.5-46.5 376.4 0 0 0 212 43.6 361.6 0 0 43.5 151.6 106.9 151.6 0 0 44.6 0 82.2-83.2 0 0 37.6-83.2 53.5-219l118.8-29.7c0 0-30.7 252.7-125.8 416.1 0 0-98 164.5-221.8 164.5 0 0-148.5 0-253.4-222.9 0 0-105-222.9-105-539 0 0 0-316 105-540.9 0 0 104.9-223.9 253.4-223.9 0 0 148.6 0 254.5 227.9zm417.8 304.1c0 0-204.9 169.4-531.7 251.6 0 0-327.7 81.3-588.1 27.8 0 0-260.4-55.5-299-215 0 0-32.7-132.8 110.9-279.4 0 0 141.6-145.6 396-242.7l16.9 65.4c0 0-148.5 63.4-230.7 143.6 0 0-84.2 84.2-65.4 156.6 0 0 24.8 92.1 199 119.8 0 0 173.3 26.8 398.1-28.7 0 0 222.7-55.5 365.3-161.5 0 0 140.6-107 116.8-200.1 0 0-19.8-80.2-162.3-114.9l-21.8-85.2c0 0 185.1 6.9 307.9 68.3 0 0 125.7 61.5 151.5 165.5 0 0 40.6 158.5-163.4 328.9z"/>
+</svg>

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/controller/CheckingController.java

@@ -0,0 +1,34 @@
+package com.eshore.gringotts.web.domain.base.controller;
+
+import com.eshore.gringotts.web.configuration.amis.AmisResponse;
+import com.eshore.gringotts.web.domain.base.entity.CheckingNeededEntity;
+import com.eshore.gringotts.web.domain.base.service.CheckingService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * @author wn
+ * @version 20241224
+ */
+@Slf4j
+public abstract class CheckingController<ENTITY extends CheckingNeededEntity, SAVE_ITEM, LIST_ITEM, DETAIL_ITEM> extends SimpleControllerSupport<ENTITY, SAVE_ITEM, LIST_ITEM, DETAIL_ITEM> {
+  private final CheckingService<ENTITY> checkingService;
+
+  public CheckingController(CheckingService<ENTITY> service) {
+    super(service);
+    this.checkingService = service;
+  }
+
+  @GetMapping("/submit/{id}")
+  public AmisResponse<Object> submit(@PathVariable Long id) throws Exception {
+    checkingService.submit(id);
+    return AmisResponse.responseSuccess();
+  }
+
+  @GetMapping("/retract/{id}")
+  public AmisResponse<Object> retract(@PathVariable Long id) throws Exception {
+    checkingService.retract(id);
+    return AmisResponse.responseSuccess();
+  }
+}

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

@@ -1,6 +1,10 @@
 package com.eshore.gringotts.web.domain.base.service;
 
+import com.eshore.gringotts.web.domain.base.entity.LogicDeleteEntity;
+import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
 import com.eshore.gringotts.web.domain.entity.CheckOrder;
+import com.eshore.gringotts.web.domain.service.UserService;
+import javax.persistence.EntityManager;
 import org.eclipse.collections.api.map.ImmutableMap;
 
 /**
@@ -9,6 +13,16 @@ import org.eclipse.collections.api.map.ImmutableMap;
  * @author lanyuanxiaoyao
  * @date 2024-11-28
  */
-public interface CheckingService {
+public abstract class CheckingService<ENTITY extends LogicDeleteEntity> extends LogicDeleteService<ENTITY> {
-  void onChecked(CheckOrder order, CheckOrder.Operation operation, ImmutableMap<String, Object> parameters);
+  public CheckingService(SimpleRepository<ENTITY, Long> repository, UserService userService, EntityManager manager) {
+    super(repository, userService, manager);
+  }
+
+  abstract public void submit(Long id) throws Exception;
+
+  abstract public void retract(Long id) throws Exception;
+
+  abstract public void onChecked(CheckOrder order, CheckOrder.Operation operation, ImmutableMap<String, Object> parameters);
+
+  abstract public ImmutableMap<String, Object> archive(ENTITY entity);
 }

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

@@ -1,7 +1,6 @@
 package com.eshore.gringotts.web.domain.controller;
 
-import com.eshore.gringotts.web.configuration.amis.AmisResponse;
+import com.eshore.gringotts.web.domain.base.controller.CheckingController;
-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;
@@ -9,7 +8,6 @@ import com.eshore.gringotts.web.domain.entity.Authentication;
 import com.eshore.gringotts.web.domain.service.AuthenticationService;
 import com.eshore.gringotts.web.domain.service.DataFileService;
 import com.eshore.gringotts.web.domain.service.DataResourceService;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,8 +15,6 @@ import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.set.ImmutableSet;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -29,30 +25,16 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("authentication")
-public class AuthenticationController extends SimpleControllerSupport<Authentication, AuthenticationController.SaveItem, AuthenticationController.ListItem, AuthenticationController.DetailItem> {
+public class AuthenticationController extends CheckingController<Authentication, AuthenticationController.SaveItem, AuthenticationController.ListItem, AuthenticationController.DetailItem> {
-  private final AuthenticationService authenticationService;
   private final DataResourceService dataResourceService;
   private final DataFileService dataFileService;
 
   public AuthenticationController(AuthenticationService service, DataResourceService dataResourceService, DataFileService dataFileService) {
     super(service);
-    this.authenticationService = service;
     this.dataResourceService = dataResourceService;
     this.dataFileService = dataFileService;
   }
 
-  @GetMapping("/submit/{id}")
-  public AmisResponse<Object> submit(@PathVariable Long id) throws JsonProcessingException {
-    authenticationService.submit(id);
-    return AmisResponse.responseSuccess();
-  }
-
-  @GetMapping("/retract/{id}")
-  public AmisResponse<Object> retract(@PathVariable Long id) {
-    authenticationService.retract(id);
-    return AmisResponse.responseSuccess();
-  }
-
   @Override
   protected Authentication fromSaveItem(SaveItem item) throws Exception {
     Authentication authentication = new Authentication();

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

@@ -1,7 +1,6 @@
 package com.eshore.gringotts.web.domain.controller;
 
-import com.eshore.gringotts.web.configuration.amis.AmisResponse;
+import com.eshore.gringotts.web.domain.base.controller.CheckingController;
-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;
@@ -9,15 +8,12 @@ import com.eshore.gringotts.web.domain.entity.Confirmation;
 import com.eshore.gringotts.web.domain.service.ConfirmationService;
 import com.eshore.gringotts.web.domain.service.DataFileService;
 import com.eshore.gringotts.web.domain.service.DataResourceService;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.set.ImmutableSet;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -28,30 +24,16 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("confirmation")
-public class ConfirmationController extends SimpleControllerSupport<Confirmation, ConfirmationController.SaveItem, ConfirmationController.ListItem, ConfirmationController.DetailItem> {
+public class ConfirmationController extends CheckingController<Confirmation, ConfirmationController.SaveItem, ConfirmationController.ListItem, ConfirmationController.DetailItem> {
-  private final ConfirmationService confirmationService;
   private final DataResourceService dataResourceService;
   private final DataFileService dataFileService;
 
-  public ConfirmationController(ConfirmationService service, ConfirmationService confirmationService, DataResourceService dataResourceService, DataFileService dataFileService) {
+  public ConfirmationController(ConfirmationService service, DataResourceService dataResourceService, DataFileService dataFileService) {
     super(service);
-    this.confirmationService = confirmationService;
     this.dataResourceService = dataResourceService;
     this.dataFileService = dataFileService;
   }
 
-  @GetMapping("/submit/{id}")
-  public AmisResponse<Object> submit(@PathVariable Long id) throws JsonProcessingException {
-    confirmationService.submit(id);
-    return AmisResponse.responseSuccess();
-  }
-
-  @GetMapping("/retract/{id}")
-  public AmisResponse<Object> retract(@PathVariable Long id) {
-    confirmationService.retract(id);
-    return AmisResponse.responseSuccess();
-  }
-
   @Override
   protected Confirmation fromSaveItem(SaveItem item) throws Exception {
     Confirmation confirmation = new Confirmation();

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

@@ -3,21 +3,19 @@ package com.eshore.gringotts.web.domain.controller;
 import cn.hutool.core.util.StrUtil;
 import com.eshore.gringotts.web.configuration.HostConfiguration;
 import com.eshore.gringotts.web.configuration.amis.AmisResponse;
-import com.eshore.gringotts.web.domain.base.controller.SimpleControllerSupport;
+import com.eshore.gringotts.web.domain.base.controller.CheckingController;
 import com.eshore.gringotts.web.domain.base.entity.SimpleListItem;
 import com.eshore.gringotts.web.domain.base.entity.SimpleSaveItem;
 import com.eshore.gringotts.web.domain.entity.Ware;
 import com.eshore.gringotts.web.domain.service.DataFileService;
 import com.eshore.gringotts.web.domain.service.DataResourceService;
 import com.eshore.gringotts.web.domain.service.WareService;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.collections.api.list.ImmutableList;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -28,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("ware")
-public class WareController extends SimpleControllerSupport<Ware, WareController.SaveItem, WareController.ListItem, WareController.DetailItem> {
+public class WareController extends CheckingController<Ware, WareController.SaveItem, WareController.ListItem, WareController.DetailItem> {
   private final HostConfiguration hostConfiguration;
   private final WareService wareService;
   private final DataResourceService dataResourceService;
@@ -47,18 +45,6 @@ public class WareController extends SimpleControllerSupport<Ware, WareController
     return AmisResponse.responseSuccess(wareService.listPublic().collect(this::toListItem));
   }
 
-  @GetMapping("/submit/{id}")
-  public AmisResponse<Object> submit(@PathVariable Long id) throws JsonProcessingException {
-    wareService.submit(id);
-    return AmisResponse.responseSuccess();
-  }
-
-  @GetMapping("/retract/{id}")
-  public AmisResponse<Object> retract(@PathVariable Long id) {
-    wareService.retract(id);
-    return AmisResponse.responseSuccess();
-  }
-
   @Override
   protected Ware fromSaveItem(SaveItem saveItem) {
     Ware ware = new Ware();

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

@@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.eshore.gringotts.web.domain.base.entity.CheckingNeededEntity;
 import com.eshore.gringotts.web.domain.base.service.CheckingService;
-import com.eshore.gringotts.web.domain.base.service.LogicDeleteService;
 import com.eshore.gringotts.web.domain.entity.Authentication;
 import com.eshore.gringotts.web.domain.entity.Authentication_;
 import com.eshore.gringotts.web.domain.entity.CheckOrder;
@@ -33,7 +32,7 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service("com.eshore.gringotts.web.domain.service.AuthenticationService")
-public class AuthenticationService extends LogicDeleteService<Authentication> implements CheckingService {
+public class AuthenticationService extends CheckingService<Authentication> {
   private final AuthenticationRepository authenticationRepository;
   private final UserService userService;
   private final CheckOrderService checkOrderService;
@@ -84,6 +83,7 @@ public class AuthenticationService extends LogicDeleteService<Authentication> im
   }
 
   @Transactional(rollbackOn = Throwable.class)
+  @Override
   public void submit(Long id) throws JsonProcessingException {
     Authentication authentication = detailOrThrow(id);
     authentication.setState(CheckingNeededEntity.State.OWNER_CHECKING);
@@ -101,6 +101,7 @@ public class AuthenticationService extends LogicDeleteService<Authentication> im
   }
 
   @Transactional(rollbackOn = Throwable.class)
+  @Override
   public void retract(Long id) {
     Authentication authentication = detailOrThrow(id);
     authentication.setState(Authentication.State.DRAFT);
@@ -145,6 +146,11 @@ public class AuthenticationService extends LogicDeleteService<Authentication> im
     checkOrderService.save(order);
   }
 
+  @Override
+  public ImmutableMap<String, Object> archive(Authentication authentication) {
+    return null;
+  }
+
   public static final class AuthenticationDuplicatedException extends RuntimeException {
     public AuthenticationDuplicatedException() {
       super("数据资源已绑定该账号的授权申请，无法再次申请");

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

@@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.eshore.gringotts.web.domain.base.entity.CheckingNeededEntity;
 import com.eshore.gringotts.web.domain.base.service.CheckingService;
-import com.eshore.gringotts.web.domain.base.service.LogicDeleteService;
 import com.eshore.gringotts.web.domain.entity.CheckOrder;
 import com.eshore.gringotts.web.domain.entity.CheckOrder_;
 import com.eshore.gringotts.web.domain.entity.Confirmation;
@@ -35,7 +34,7 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service("com.eshore.gringotts.web.domain.service.ConfirmationService")
-public class ConfirmationService extends LogicDeleteService<Confirmation> implements CheckingService {
+public class ConfirmationService extends CheckingService<Confirmation> {
   private final ConfirmationRepository confirmationRepository;
   private final CheckOrderService checkOrderService;
   private final ObjectMapper mapper;
@@ -81,6 +80,7 @@ public class ConfirmationService extends LogicDeleteService<Confirmation> implem
   }
 
   @Transactional(rollbackOn = Throwable.class)
+  @Override
   public void submit(Long id) throws JsonProcessingException {
     Confirmation confirmation = detailOrThrow(id);
     confirmation.setState(Confirmation.State.CHECKING);
@@ -98,6 +98,7 @@ public class ConfirmationService extends LogicDeleteService<Confirmation> implem
   }
 
   @Transactional(rollbackOn = Throwable.class)
+  @Override
   public void retract(Long id) {
     Confirmation confirmation = detailOrThrow(id);
     confirmation.setState(CheckingNeededEntity.State.DRAFT);
@@ -129,6 +130,11 @@ public class ConfirmationService extends LogicDeleteService<Confirmation> implem
     }
   }
 
+  @Override
+  public ImmutableMap<String, Object> archive(Confirmation confirmation) {
+    return null;
+  }
+
   public static final class ConfirmationDuplicatedException extends RuntimeException {
     public ConfirmationDuplicatedException() {
       super("数据资源已绑定确权申请，无法再次申请");

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

@@ -2,7 +2,6 @@ package com.eshore.gringotts.web.domain.service;
 
 import cn.hutool.core.util.StrUtil;
 import com.eshore.gringotts.web.domain.base.service.CheckingService;
-import com.eshore.gringotts.web.domain.base.service.LogicDeleteService;
 import com.eshore.gringotts.web.domain.entity.CheckOrder;
 import com.eshore.gringotts.web.domain.entity.User;
 import com.eshore.gringotts.web.domain.entity.Ware;
@@ -25,7 +24,7 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service("com.eshore.gringotts.web.domain.service.WareService")
-public class WareService extends LogicDeleteService<Ware> implements CheckingService {
+public class WareService extends CheckingService<Ware> {
   private final WareRepository wareRepository;
   private final CheckOrderService checkOrderService;
   private final ObjectMapper mapper;
@@ -64,7 +63,13 @@ public class WareService extends LogicDeleteService<Ware> implements CheckingSer
     }
   }
 
+  @Override
+  public ImmutableMap<String, Object> archive(Ware ware) {
+    return null;
+  }
+
   @Transactional(rollbackOn = Throwable.class)
+  @Override
   public void submit(Long id) throws JsonProcessingException {
     Ware ware = detailOrThrow(id);
     ware.setState(Ware.State.CHECKING);
@@ -82,6 +87,7 @@ public class WareService extends LogicDeleteService<Ware> implements CheckingSer
   }
 
   @Transactional(rollbackOn = Throwable.class)
+  @Override
   public void retract(Long id) {
     Ware ware = detailOrThrow(id);
     ware.setState(Ware.State.DRAFT);