Jelajahi Sumber

refactor(park): 优化安保人员相关接口返回结果封装

- 将 SecurityPersonnelController 中的 boolean 返回类型改为 Result 类型- 在 SecurityPersonnel 实体类中添加 Swagger 注解和 Jackson日期格式注解
- 优化 ParkInfoServiceImpl 中的文件保存逻辑
林仔 1 tahun lalu
induk
melakukan
8af25a2495

+ 4 - 4
park-overview-service/src/main/java/com/zksy/park/controller/SecurityPersonnelController.java

@@ -53,8 +53,8 @@ public class SecurityPersonnelController {
     @PostMapping("/save")
     @ApiOperation(value = "安保人员新增")
     @Log(title = "安保人员", businessType = BusinessType.INSERT)
-    public boolean save(@RequestBody SecurityPersonnel securityPersonnel) {
-        return service.save(securityPersonnel);
+    public Result save(@RequestBody SecurityPersonnel securityPersonnel) {
+        return Result.ok(service.save(securityPersonnel));
     }
 
     /**
@@ -63,8 +63,8 @@ public class SecurityPersonnelController {
     @PostMapping("/updateById")
     @ApiOperation(value = "安保人员修改")
     @Log(title = "安保人员", businessType = BusinessType.UPDATE)
-    public boolean updateById(@RequestBody SecurityPersonnel securityPersonnel) {
-        return service.updateById(securityPersonnel);
+    public Result updateById(@RequestBody SecurityPersonnel securityPersonnel) {
+        return Result.ok(service.updateById(securityPersonnel));
     }
 
     @Log(title = "安保人员", businessType = BusinessType.DELETE)

+ 20 - 0
park-overview-service/src/main/java/com/zksy/park/domain/SecurityPersonnel.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -23,76 +25,94 @@ public class SecurityPersonnel implements Serializable {
     /**
      * 主键
      */
+    @ApiModelProperty(value = "主键")
     @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
      * 安保人员姓名
      */
+    @ApiModelProperty(value = "安保人员姓名")
     private String name;
 
     /**
      * 性别
      */
+    @ApiModelProperty(value = "性别")
     private String gender;
 
     /**
      * 出生日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "出生日期")
     private Date birthDate;
 
     /**
      * 身份证号码
      */
+    @ApiModelProperty(value = "身份证号码")
     private String idNumber;
 
     /**
      * 民族
      */
+    @ApiModelProperty(value = "民族")
     private String ethnicity;
 
     /**
      * 籍贯
      */
+    @ApiModelProperty(value = "籍贯")
     private String nativePlace;
 
     /**
      * 婚姻状况
      */
+    @ApiModelProperty(value = "婚姻状况")
     private String maritalStatus;
 
     /**
      * 联系电话
      */
+    @ApiModelProperty(value = "联系电话")
     private String contactPhone;
 
     /**
      * 电子邮箱
      */
+    @ApiModelProperty(value = "电子邮箱")
     private String email;
 
     /**
      * 现居住地址
      */
+    @ApiModelProperty(value = "现居住地址")
     private String currentAddress;
 
     /**
      * 创建者
      */
+    @ApiModelProperty(value = "创建者")
     private String createBy;
 
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
     /**
      * 更新者
      */
+    @ApiModelProperty(value = "更新者")
     private String updateBy;
 }

+ 1 - 0
park-overview-service/src/main/java/com/zksy/park/service/imp/ParkInfoServiceImpl.java

@@ -43,6 +43,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
             entity.setCreateTime(LocalDateTime.now());
             entity.setUpdateTime(LocalDateTime.now());
             baseMapper.insert(entity);
+
             if (StrUtil.isNotBlank(dto.getFilePath())) {
                 FileGeneral fileGeneral = new FileGeneral();
                 fileGeneral.setFormId(entity.getId());