From 74681699f468e7dda87a798b07870c7f6b84c885 Mon Sep 17 00:00:00 2001 From: lishiwei <3230787218@qq.com> Date: Wed, 22 Jul 2026 11:43:55 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E6=B7=BB=E5=8A=A0=E6=B6=88=E9=98=B2?= =?UTF-8?q?=E9=98=9F=E6=89=80=E5=B1=9E=E6=9C=BA=E6=9E=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/convertor/FireBrigadeCoConvertor.java | 3 +++ .../java/com/zcloud/zcGbsServicer/dto/FireBrigadeAddCmd.java | 5 +++++ .../zcloud/zcGbsServicer/dto/clientobject/FireBrigadeCO.java | 2 ++ .../zcGbsServicer/persistence/dataobject/FireBrigadeDO.java | 1 + web-infrastructure/src/main/resources/fireAlarm.sql | 1 + 5 files changed, 12 insertions(+) diff --git a/web-app/src/main/java/com/zcloud/zcGbsServicer/command/convertor/FireBrigadeCoConvertor.java b/web-app/src/main/java/com/zcloud/zcGbsServicer/command/convertor/FireBrigadeCoConvertor.java index c228f70..dbe824a 100644 --- a/web-app/src/main/java/com/zcloud/zcGbsServicer/command/convertor/FireBrigadeCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/zcGbsServicer/command/convertor/FireBrigadeCoConvertor.java @@ -3,13 +3,16 @@ package com.zcloud.zcGbsServicer.command.convertor; import com.zcloud.zcGbsServicer.dto.clientobject.FireBrigadeCO; import com.zcloud.zcGbsServicer.persistence.dataobject.FireBrigadeDO; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; import java.util.List; @Mapper(componentModel = "spring") public interface FireBrigadeCoConvertor { + @Mapping(source = "orgName", target = "org") List converDOsToCOs(List fireBrigadeDOs); + @Mapping(source = "orgName", target = "org") FireBrigadeCO converDOToCO(FireBrigadeDO fireBrigadeDO); } diff --git a/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/FireBrigadeAddCmd.java b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/FireBrigadeAddCmd.java index c62a564..39f9564 100644 --- a/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/FireBrigadeAddCmd.java +++ b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/FireBrigadeAddCmd.java @@ -1,6 +1,7 @@ package com.zcloud.zcGbsServicer.dto; import com.alibaba.cola.dto.Command; +import com.fasterxml.jackson.annotation.JsonAlias; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,6 +19,10 @@ public class FireBrigadeAddCmd extends Command { @ApiModelProperty("负责人部门") private String leaderDept; + @ApiModelProperty("所属机构") + @JsonAlias("orgName") + private String org; + @ApiModelProperty("负责人用户ID") private Long leaderUserId; diff --git a/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/clientobject/FireBrigadeCO.java b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/clientobject/FireBrigadeCO.java index aecf211..b8dfd1b 100644 --- a/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/clientobject/FireBrigadeCO.java +++ b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/clientobject/FireBrigadeCO.java @@ -19,6 +19,8 @@ public class FireBrigadeCO extends ClientObject { @JsonProperty("leaderDept") private String leaderDeptName; + private String org; + private Long leaderUserId; @JsonProperty("leader") diff --git a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/dataobject/FireBrigadeDO.java b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/dataobject/FireBrigadeDO.java index 2071402..dbabaad 100644 --- a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/dataobject/FireBrigadeDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/dataobject/FireBrigadeDO.java @@ -19,6 +19,7 @@ public class FireBrigadeDO extends BaseDO { private String leaderName; private String leaderPhone; private String leaderDeptName; + private String orgName; private String address; private String dutyPhone; private LocalDate establishDate; diff --git a/web-infrastructure/src/main/resources/fireAlarm.sql b/web-infrastructure/src/main/resources/fireAlarm.sql index 4dcced1..826946b 100644 --- a/web-infrastructure/src/main/resources/fireAlarm.sql +++ b/web-infrastructure/src/main/resources/fireAlarm.sql @@ -141,6 +141,7 @@ CREATE TABLE `fire_brigade` ( `leader_name` varchar(64) DEFAULT NULL COMMENT '负责人姓名', `leader_phone` varchar(32) DEFAULT NULL COMMENT '负责人电话', `leader_dept_name` varchar(128) DEFAULT NULL COMMENT '负责人部门名称', + `org_name` varchar(128) DEFAULT NULL COMMENT '所属机构', `address` varchar(255) DEFAULT NULL COMMENT '地址', `duty_phone` varchar(32) DEFAULT NULL COMMENT '应急值班电话', `establish_date` date DEFAULT NULL COMMENT '成立日期',