From de55ddbc4876ba6fb18a6565b4c5154c8dbd413d Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Mon, 21 Apr 2025 18:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                                  |  3 ++-
 client/src/views/management/Organization.vue        | 12 +++++++-----
 .../server/controller/OrganizationController.java   | 13 +++++++++++--
 .../server/controller/base/AbstractController.java  |  9 ++++++---
 .../lanyuanxiaoyao/server/entity/Organization.java  |  2 ++
 .../server/entity/mapper/DepartmentMapper.java      |  4 ++--
 .../server/entity/mapper/EntityMapper.java          |  2 +-
 .../server/entity/mapper/OrganizationMapper.java    |  4 ++++
 8 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index edac14c..4067134 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,7 +7,6 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="spring-boot-apijson-server" />
       </profile>
       <profile name="Annotation profile for spring-boot-server-template" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
@@ -22,11 +21,13 @@
           <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok-mapstruct-binding/0.2.0/lombok-mapstruct-binding-0.2.0.jar" />
         </processorPath>
         <module name="spring-boot-server-template" />
+        <module name="spring-boot-apijson-server" />
       </profile>
     </annotationProcessing>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="spring-boot-apijson-server" options="-Amapstruct.defaultComponentModel=spring -Amapstruct.defaultInjectionStrategy=constructor" />
       <module name="spring-boot-server-template" options="-Amapstruct.defaultComponentModel=spring -Amapstruct.defaultInjectionStrategy=constructor" />
     </option>
   </component>
diff --git a/client/src/views/management/Organization.vue b/client/src/views/management/Organization.vue
index 33aeac7..7b34213 100644
--- a/client/src/views/management/Organization.vue
+++ b/client/src/views/management/Organization.vue
@@ -1,9 +1,6 @@
 <script setup>
 import {onMounted} from 'vue'
-import {
-  amisElideJsonapiAdaptor,
-  amisRender,
-} from '@/utils.js'
+import {amisElideJsonapiAdaptor, amisRender,} from '@/utils.js'
 
 onMounted(() => {
   amisRender(
@@ -53,7 +50,7 @@ onMounted(() => {
                 url: `${information.baseUrl}/jsonapi/organization`,
                 data: {
                   fields: {
-                    organization: 'name'
+                    organization: 'code,name'
                   },
                   page: {
                     size: '${perPage|default:undefined}',
@@ -65,11 +62,16 @@ onMounted(() => {
               columns: [
                 {
                   name: 'id',
+                  hidden: true,
+                },
+                {
+                  name: 'code',
                   label: '组织编号',
                 },
                 {
                   name: 'name',
                   label: '组织名称',
+                  required: true,
                 },
               ],
             },
diff --git a/src/main/java/com/lanyuanxiaoyao/server/controller/OrganizationController.java b/src/main/java/com/lanyuanxiaoyao/server/controller/OrganizationController.java
index 7df8636..90aac4a 100644
--- a/src/main/java/com/lanyuanxiaoyao/server/controller/OrganizationController.java
+++ b/src/main/java/com/lanyuanxiaoyao/server/controller/OrganizationController.java
@@ -2,6 +2,8 @@ package com.lanyuanxiaoyao.server.controller;
 
 import com.lanyuanxiaoyao.server.controller.base.AbstractController;
 import com.lanyuanxiaoyao.server.entity.Organization;
+import com.lanyuanxiaoyao.server.entity.mapper.EntityMapper;
+import com.lanyuanxiaoyao.server.entity.mapper.OrganizationMapper;
 import com.lanyuanxiaoyao.server.service.OrganizationService;
 import com.lanyuanxiaoyao.server.service.base.AbstractService;
 import lombok.extern.slf4j.Slf4j;
@@ -11,15 +13,22 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("organization")
-public class OrganizationController extends AbstractController<Organization, Long> {
+public class OrganizationController extends AbstractController<Organization, Long, Organization.SaveVO> {
   private final OrganizationService organizationService;
+  private final OrganizationMapper organizationMapper;
 
-  public OrganizationController(OrganizationService organizationService) {
+  public OrganizationController(OrganizationService organizationService, OrganizationMapper organizationMapper) {
     this.organizationService = organizationService;
+    this.organizationMapper = organizationMapper;
   }
 
   @Override
   public AbstractService<Organization, Long> getService() {
     return organizationService;
   }
+
+  @Override
+  public EntityMapper<Organization, Organization.SaveVO> getEntityMapper() {
+    return organizationMapper;
+  }
 }
diff --git a/src/main/java/com/lanyuanxiaoyao/server/controller/base/AbstractController.java b/src/main/java/com/lanyuanxiaoyao/server/controller/base/AbstractController.java
index 0fd5bb4..46c7499 100644
--- a/src/main/java/com/lanyuanxiaoyao/server/controller/base/AbstractController.java
+++ b/src/main/java/com/lanyuanxiaoyao/server/controller/base/AbstractController.java
@@ -1,21 +1,24 @@
 package com.lanyuanxiaoyao.server.controller.base;
 
+import com.lanyuanxiaoyao.server.entity.mapper.EntityMapper;
 import com.lanyuanxiaoyao.server.service.base.AbstractService;
 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;
 
-public abstract class AbstractController<ENTITY, ID> {
+public abstract class AbstractController<ENTITY, ID, SAVE_VO> {
   public abstract AbstractService<ENTITY, ID> getService();
 
+  public abstract EntityMapper<ENTITY, SAVE_VO> getEntityMapper();
+
   @GetMapping("/get/{id}")
   public ENTITY get(@PathVariable("id") ID id) {
     return getService().get(id);
   }
 
   @PostMapping("/save")
-  public ID save(@RequestBody ENTITY entity) {
-    return getService().save(entity);
+  public ID save(@RequestBody SAVE_VO entity) {
+    return getService().save(getEntityMapper().fromVO(entity));
   }
 }
diff --git a/src/main/java/com/lanyuanxiaoyao/server/entity/Organization.java b/src/main/java/com/lanyuanxiaoyao/server/entity/Organization.java
index a305a10..c5ceb8a 100644
--- a/src/main/java/com/lanyuanxiaoyao/server/entity/Organization.java
+++ b/src/main/java/com/lanyuanxiaoyao/server/entity/Organization.java
@@ -32,6 +32,7 @@ public class Organization {
   @GeneratedValue(generator = "snowflakeId")
   @GenericGenerator(name = "snowflakeId", type = SnowflakeId.IdGenerator.class)
   private Long id;
+  private String code;
   private String name;
 
   @OneToMany(fetch = FetchType.LAZY, mappedBy = "organization")
@@ -43,6 +44,7 @@ public class Organization {
   @ToString
   public static final class SaveVO {
     private Long id;
+    private String code;
     private String name;
   }
 }
diff --git a/src/main/java/com/lanyuanxiaoyao/server/entity/mapper/DepartmentMapper.java b/src/main/java/com/lanyuanxiaoyao/server/entity/mapper/DepartmentMapper.java
index 74b1ba1..625a31a 100644
--- a/src/main/java/com/lanyuanxiaoyao/server/entity/mapper/DepartmentMapper.java
+++ b/src/main/java/com/lanyuanxiaoyao/server/entity/mapper/DepartmentMapper.java
@@ -19,9 +19,9 @@ import org.mapstruct.Mapping;
         DepartmentService.class,
     }
 )
-public abstract class DepartmentMapper implements EntityMapper<Department, DepartmentSaveVO> {
+public interface DepartmentMapper extends EntityMapper<Department, DepartmentSaveVO> {
   @Mapping(target = "organization", source = "organizationId")
   @Mapping(target = "parent", source = "parentId")
   @Override
-  public abstract Department fromVO(DepartmentSaveVO saveVO);
+  Department fromVO(DepartmentSaveVO saveVO);
 }
diff --git a/src/main/java/com/lanyuanxiaoyao/server/entity/mapper/EntityMapper.java b/src/main/java/com/lanyuanxiaoyao/server/entity/mapper/EntityMapper.java
index 4a0418e..409191f 100644
--- a/src/main/java/com/lanyuanxiaoyao/server/entity/mapper/EntityMapper.java
+++ b/src/main/java/com/lanyuanxiaoyao/server/entity/mapper/EntityMapper.java
@@ -1,5 +1,5 @@
 package com.lanyuanxiaoyao.server.entity.mapper;
 
-interface EntityMapper<SE, CE> {
+public interface EntityMapper<SE, CE> {
   SE fromVO(CE creationVO);
 }
diff --git a/src/main/java/com/lanyuanxiaoyao/server/entity/mapper/OrganizationMapper.java b/src/main/java/com/lanyuanxiaoyao/server/entity/mapper/OrganizationMapper.java
index d0f6535..4badb39 100644
--- a/src/main/java/com/lanyuanxiaoyao/server/entity/mapper/OrganizationMapper.java
+++ b/src/main/java/com/lanyuanxiaoyao/server/entity/mapper/OrganizationMapper.java
@@ -2,6 +2,7 @@ package com.lanyuanxiaoyao.server.entity.mapper;
 
 import com.lanyuanxiaoyao.server.entity.Organization;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 
 /**
  * 组织bean转换
@@ -11,4 +12,7 @@ import org.mapstruct.Mapper;
  */
 @Mapper
 public interface OrganizationMapper extends EntityMapper<Organization, Organization.SaveVO> {
+  @Mapping(target = "code", defaultExpression = "java(String.valueOf(creationVO.getId()))")
+  @Override
+  Organization fromVO(Organization.SaveVO creationVO);
 }