feat(rescue-team): 添加救援队经纬度字段并优化配置文件

start/src/main/resources/bootstrap.yml

@@ -1,8 +1,8 @@
 spring:
   config:
     import:
-      - classpath:nacos.yml
+#      - classpath:nacos.yml
-      - classpath:sdk.yml
+#      - classpath:sdk.yml
-#      - classpath:nacos-prod.yml
+      - classpath:nacos-prod.yml
-#      - classpath:sdk-prod.yml
+      - classpath:sdk-prod.yml
       - classpath:swagger.yml

web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/RescueTeamQueryExe.java

@@ -41,7 +41,7 @@ public class RescueTeamQueryExe {
     private final ResourcePersonCoConvertor resourcePersonCoConvertor;
 
     /**
-     * 鍒嗛〉
+     * 分页
      */
     public PageResponse<RescueTeamCO> execute(RescueTeamPageQry rescueTeamPageQry) {
         Map<String, Object> params = PageQueryHelper.toHashMap(rescueTeamPageQry);
@@ -67,7 +67,7 @@ public class RescueTeamQueryExe {
     }
 
     /**
-     * 鍙鍖栧ぇ灞忔秷闃叉晳鎻撮槦鏌ヨ
+     * 可视化大屏消防救援队查询
      */
     public PageResponse<RescueTeamScreenCO> listScreen(RescueTeamScreenQry qry) {
 
@@ -83,7 +83,7 @@ public class RescueTeamQueryExe {
     }
 
     /**
-     * 璇︽儏
+     * 详情
      */
     public RescueTeamCO getById(Long id) {
         RescueTeamDO rescueTeamDO = rescueTeamRepository.getById(id);

web-client/src/main/java/com/zcloud/zcGbsServicer/dto/RescueTeamAddCmd.java

@@ -7,7 +7,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import javax.validation.constraints.*;
+
+import javax.validation.constraints.NotEmpty;
 import java.time.LocalDate;
 import java.util.List;
 
@@ -22,55 +23,48 @@ import java.util.List;
 @AllArgsConstructor
 public class RescueTeamAddCmd extends Command {
     @ApiModelProperty(value = "业务主键ID", name = "teamId", required = true)
-//    @NotEmpty(message = "业务主键ID不能为空")
     private String teamId;
 
     @ApiModelProperty(value = "救援队名称", name = "teamName", required = true)
     @NotEmpty(message = "救援队名称不能为空")
     private String teamName;
 
-    @ApiModelProperty(value = "类型(字典码)", name = "teamType", required = true)
+    @ApiModelProperty(value = "类型", name = "teamType", required = true)
-//    @NotEmpty(message = "类型(字典码)不能为空")
     private String teamType;
 
     @ApiModelProperty(value = "类型名称")
     private String teamTypeName;
 
-    @ApiModelProperty(value = "负责人单位或部门", name = "chargeOrgDept", required = true)
+    @ApiModelProperty(value = "负责单位或部门", name = "chargeOrgDept", required = true)
-//    @NotEmpty(message = "负责人单位或部门不能为空")
     private String chargeOrgDept;
 
     @ApiModelProperty(value = "队长", name = "captainName", required = true)
-//    @NotEmpty(message = "队长不能为空")
     private String captainName;
 
     @ApiModelProperty(value = "队长电话", name = "captainPhone", required = true)
-//    @NotEmpty(message = "队长电话不能为空")
     private String captainPhone;
 
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
     @ApiModelProperty(value = "指挥人员")
-//    @NotEmpty(message = "指挥人员不能为空")
     private String commandCrew;
 
     @ApiModelProperty(value = "建立日期", name = "establishDate", required = true)
-//    @NotNull(message = "建立日期不能为空")
     private LocalDate establishDate;
 
-    @ApiModelProperty(value = "所属区域或范围(字典码)", name = "regionScope", required = true)
+    @ApiModelProperty(value = "所属区域或范围", name = "regionScope", required = true)
-//    @NotEmpty(message = "所属区域或范围(字典码)不能为空")
     private String regionScope;
 
     @ApiModelProperty(value = "所属区域名称")
     private String regionScopeName;
 
     @ApiModelProperty(value = "职责和任务范围", name = "dutyScope", required = true)
-//    @NotEmpty(message = "职责和任务范围不能为空")
     private String dutyScope;
 
     @ApiModelProperty(value = "消防队员")
     private List<ResourcePersonE> rescueMembers;
-
-
-    
 }
-

web-client/src/main/java/com/zcloud/zcGbsServicer/dto/RescueTeamUpdateCmd.java

@@ -6,7 +6,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import javax.validation.constraints.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.util.List;
 
@@ -23,41 +25,50 @@ public class RescueTeamUpdateCmd extends Command {
     @ApiModelProperty(value = "主键", name = "id", required = true)
     @NotNull(message = "主键不能为空")
     private Long id;
+
     @ApiModelProperty(value = "业务主键ID", name = "teamId", required = true)
-//    @NotEmpty(message = "业务主键ID不能为空")
     private String teamId;
+
     @ApiModelProperty(value = "救援队名称", name = "teamName", required = true)
     @NotEmpty(message = "救援队名称不能为空")
     private String teamName;
-    @ApiModelProperty(value = "类型(字典码)", name = "teamType", required = true)
+
-//    @NotEmpty(message = "类型(字典码)不能为空")
+    @ApiModelProperty(value = "类型", name = "teamType", required = true)
     private String teamType;
+
     @ApiModelProperty(value = "类型名称")
     private String teamTypeName;
-    @ApiModelProperty(value = "负责人单位或部门", name = "chargeOrgDept", required = true)
+
-//    @NotEmpty(message = "负责人单位或部门不能为空")
+    @ApiModelProperty(value = "负责单位或部门", name = "chargeOrgDept", required = true)
     private String chargeOrgDept;
+
     @ApiModelProperty(value = "队长", name = "captainName", required = true)
-//    @NotEmpty(message = "队长不能为空")
     private String captainName;
+
     @ApiModelProperty(value = "队长电话", name = "captainPhone", required = true)
-//    @NotEmpty(message = "队长电话不能为空")
     private String captainPhone;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
     @ApiModelProperty(value = "指挥人员")
-//    @NotEmpty(message = "指挥人员不能为空")
+    private String commandCrew;
-    private String commandCrew;;
+
     @ApiModelProperty(value = "建立日期", name = "establishDate", required = true)
-//    @NotNull(message = "建立日期不能为空")
     private LocalDate establishDate;
-    @ApiModelProperty(value = "所属区域或范围(字典码)", name = "regionScope", required = true)
+
-//    @NotEmpty(message = "所属区域或范围(字典码)不能为空")
+    @ApiModelProperty(value = "所属区域或范围", name = "regionScope", required = true)
     private String regionScope;
+
     @ApiModelProperty(value = "所属区域或范围名称")
     private String regionScopeName;
+
     @ApiModelProperty(value = "职责和任务范围", name = "dutyScope", required = true)
-//    @NotEmpty(message = "职责和任务范围不能为空")
     private String dutyScope;
+
     @ApiModelProperty(value = "消防队员")
     private List<ResourcePersonAddCmd> rescueMembers;
 }
-

web-client/src/main/java/com/zcloud/zcGbsServicer/dto/clientobject/RescueTeamCO.java

@@ -8,7 +8,6 @@ import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
-
 /**
 * web-client
 * @Author makejava
@@ -16,84 +15,90 @@ import java.util.List;
 */
 @Data
 public class RescueTeamCO extends ClientObject {
-    //主键
     @ApiModelProperty(value = "主键")
     private Long id;
-    //业务主键ID
+
     @ApiModelProperty(value = "业务主键ID")
     private String teamId;
-    //救援队名称
+
     @ApiModelProperty(value = "救援队名称")
     private String teamName;
-    //类型(字典码)
+
-    @ApiModelProperty(value = "类型(字典码)")
+    @ApiModelProperty(value = "类型")
     private String teamType;
+
     @ApiModelProperty(value = "类型名称")
     private String teamTypeName;
-    //负责人单位或部门
+
-    @ApiModelProperty(value = "负责人单位或部门")
+    @ApiModelProperty(value = "负责单位或部门")
     private String chargeOrgDept;
-    //队长
+
     @ApiModelProperty(value = "队长")
     private String captainName;
-    //队长电话
+
     @ApiModelProperty(value = "队长电话")
     private String captainPhone;
-    //建立日期
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
     @ApiModelProperty(value = "建立日期")
     private LocalDate establishDate;
-    //所属区域或范围(字典码)
+
-    @ApiModelProperty(value = "所属区域或范围(字典码)")
+    @ApiModelProperty(value = "所属区域或范围")
     private String regionScope;
+
     @ApiModelProperty(value = "所属区域或范围名称")
     private String regionScopeName;
-    //职责和任务范围
+
     @ApiModelProperty(value = "职责和任务范围")
     private String dutyScope;
-    //删除标识true false
+
-    @ApiModelProperty(value = "删除标识true false")
+    @ApiModelProperty(value = "删除标识")
     private String deleteEnum;
-    //备注
+
     @ApiModelProperty(value = "备注")
     private String remarks;
-    //创建人姓名
+
     @ApiModelProperty(value = "创建人姓名")
     private String createName;
-    //更新人姓名
+
     @ApiModelProperty(value = "更新人姓名")
     private String updateName;
-    //租户id
+
     @ApiModelProperty(value = "租户id")
     private Long tenantId;
-    //单位id
+
     @ApiModelProperty(value = "单位id")
     private Long orgId;
-    //版本
+
     @ApiModelProperty(value = "版本")
     private Integer version;
-    //创建时间
+
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
-    //修改时间
+
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
-    //创建人id
+
     @ApiModelProperty(value = "创建人id")
     private Long createId;
-    //修改人id
+
     @ApiModelProperty(value = "修改人id")
     private Long updateId;
-    //环境
+
     @ApiModelProperty(value = "环境")
     private String env;
-    //队员人数
+
     @ApiModelProperty(value = "队员人数")
     private Integer memberCount;
-    //救援队员
+
     @ApiModelProperty(value = "救援队员")
     private List<ResourcePersonCO> rescueMembers;
-    //指挥人员
+
     @ApiModelProperty(value = "指挥人员")
     private String commandCrew;
 }
-

web-client/src/main/java/com/zcloud/zcGbsServicer/dto/clientobject/RescueTeamScreenCO.java

@@ -14,52 +14,82 @@ import java.util.Date;
 public class RescueTeamScreenCO extends ClientObject {
     @ApiModelProperty(value = "主键")
     private Long id;
+
     @ApiModelProperty(value = "业务主键ID")
     private String teamId;
+
     @ApiModelProperty(value = "救援队名称")
     private String teamName;
+
     @ApiModelProperty(value = "类型字典")
     private String teamType;
+
     @ApiModelProperty(value = "类型名称")
     private String teamTypeName;
+
     @ApiModelProperty(value = "负责单位或部门")
     private String chargeOrgDept;
+
     @ApiModelProperty(value = "队长")
     private String captainName;
+
     @ApiModelProperty(value = "队长电话")
     private String captainPhone;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
     @ApiModelProperty(value = "指挥人员")
     private String commandCrew;
+
     @ApiModelProperty(value = "建立日期")
     private LocalDate establishDate;
+
     @ApiModelProperty(value = "所属区域范围字典")
     private String regionScope;
+
     @ApiModelProperty(value = "所属区域范围名称")
     private String regionScopeName;
+
     @ApiModelProperty(value = "职责和任务范围")
     private String dutyScope;
-    @ApiModelProperty(value = "删除标识true false")
+
+    @ApiModelProperty(value = "删除标识")
     private String deleteEnum;
+
     @ApiModelProperty(value = "备注")
     private String remarks;
+
     @ApiModelProperty(value = "创建人姓名")
     private String createName;
+
     @ApiModelProperty(value = "更新人姓名")
     private String updateName;
+
     @ApiModelProperty(value = "租户id")
     private Long tenantId;
+
     @ApiModelProperty(value = "单位id")
     private Long orgId;
+
     @ApiModelProperty(value = "版本")
     private Integer version;
+
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
+
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
+
     @ApiModelProperty(value = "创建人id")
     private Long createId;
+
     @ApiModelProperty(value = "修改人id")
     private Long updateId;
+
     @ApiModelProperty(value = "环境")
     private String env;
 }

web-domain/src/main/java/com/zcloud/zcGbsServicer/domain/model/RescueTeamE.java

@@ -3,12 +3,9 @@ package com.zcloud.zcGbsServicer.domain.model;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.cola.domain.Entity;
 import com.jjb.saas.framework.domain.model.BaseE;
 import com.zcloud.zcGbsServicer.domain.enums.PersonTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -20,34 +17,22 @@ import java.util.List;
 */
 @Data
 public class RescueTeamE extends BaseE {
-    //业务主键ID
     private String teamId;
-    //救援队名称
     private String teamName;
-    //类型(字典码)
     private String teamType;
-    //类型名称
     private String teamTypeName;
-    //负责人单位或部门
     private String chargeOrgDept;
-    //队长
     private String captainName;
-    //队长电话
     private String captainPhone;
-    //建立日期
+    private String longitude;
+    private String latitude;
     private LocalDate establishDate;
-    //所属区域或范围(字典码)
     private String regionScope;
-    //所属区域或范围名称
     private String regionScopeName;
-    //职责和任务范围
     private String dutyScope;
-    //指挥人员
     private String commandCrew;
-    //消防队员
     private List<ResourcePersonE> rescueMembers;
 
-
     public void addInit() {
         if (StrUtil.isBlank(this.teamId)) {
             this.teamId = IdUtil.simpleUUID();
@@ -65,6 +50,4 @@ public class RescueTeamE extends BaseE {
             this.rescueMembers = teamMembers;
         }
     }
-
 }
-

web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/dataobject/RescueTeamDO.java

@@ -2,7 +2,7 @@ package com.zcloud.zcGbsServicer.persistence.dataobject;
 
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,44 +21,49 @@ import java.time.LocalDate;
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 public class RescueTeamDO extends BaseDO {
-    //业务主键ID
     @ApiModelProperty(value = "业务主键ID")
     private String teamId;
-    //救援队名称
+
     @ApiModelProperty(value = "救援队名称")
     private String teamName;
-    //类型(字典码)
+
-    @ApiModelProperty(value = "类型(字典码)")
+    @ApiModelProperty(value = "类型")
     private String teamType;
-    //类型名称
+
     @ApiModelProperty(value = "类型名称")
     private String teamTypeName;
-    //负责人单位或部门
+
-    @ApiModelProperty(value = "负责人单位或部门")
+    @ApiModelProperty(value = "负责单位或部门")
     private String chargeOrgDept;
-    //队长
+
     @ApiModelProperty(value = "队长")
     private String captainName;
-    //队长电话
+
     @ApiModelProperty(value = "队长电话")
     private String captainPhone;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
     @ApiModelProperty(value = "指挥人员")
     private String commandCrew;
-    //建立日期
+
     @ApiModelProperty(value = "建立日期")
     private LocalDate establishDate;
-    //所属区域或范围(字典码)
+
-    @ApiModelProperty(value = "所属区域或范围(字典码)")
+    @ApiModelProperty(value = "所属区域或范围")
     private String regionScope;
+
     @ApiModelProperty(value = "所属区域或范围名称")
     private String regionScopeName;
-    //职责和任务范围
+
     @ApiModelProperty(value = "职责和任务范围")
     private String dutyScope;
 
     public RescueTeamDO(String teamId) {
         this.teamId = StrUtil.isNotBlank(teamId) ? teamId : IdUtil.simpleUUID();
     }
-
 }
-