diff --git a/aircraft-system/src/main/java/com/aircraft/modules/article/controller/CpMaterialController.java b/aircraft-system/src/main/java/com/aircraft/modules/article/controller/CpMaterialController.java index 3f8e20d..8bb25fa 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/article/controller/CpMaterialController.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/article/controller/CpMaterialController.java @@ -105,10 +105,10 @@ public class CpMaterialController { cpMaterial.setCreateTime(LocalDateTime.now()); cpMaterial.setUpdateTime(LocalDateTime.now()); cpMaterial.setDelFlag(0); // 默认未删除 - // 设置创建人ID - Long creatorId = getCurrentUserId(); - String name = userMapper.getNameById(creatorId); - cpMaterial.setCreateBy(name); // 假设表中有creator_id字段 +// // 设置创建人ID +// Long creatorId = getCurrentUserId(); +// String name = userMapper.getNameById(creatorId); +// cpMaterial.setCreateBy(name); // 假设表中有creator_id字段 // 保存素材 materialService.save(cpMaterial); @@ -141,6 +141,7 @@ public class CpMaterialController { } // 更新素材(不修改创建时间和删除标记) material.setCreateTime(existing.getCreateTime()); // 保留原创建时间 + material.setUpdateTime(LocalDateTime.now()); material.setDelFlag(existing.getDelFlag()); // 保留删除状态 materialService.updateById(material); return ResponseEntity.ok(material); diff --git a/aircraft-system/src/main/java/com/aircraft/modules/article/domain/CpMaterial.java b/aircraft-system/src/main/java/com/aircraft/modules/article/domain/CpMaterial.java index 917dfcd..b98a979 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/article/domain/CpMaterial.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/article/domain/CpMaterial.java @@ -1,9 +1,7 @@ package com.aircraft.modules.article.domain; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.*; import com.aircraft.base.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -42,9 +40,11 @@ public class CpMaterial { @ApiModelProperty(value = "链接地址") private String url; + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建者,默认null") private String createBy; + @TableField(fill = FieldFill.INSERT_UPDATE) @ApiModelProperty(value = "更新者,默认null") private String updateBy; diff --git a/aircraft-system/src/main/java/com/aircraft/modules/route/controller/CpRouteController.java b/aircraft-system/src/main/java/com/aircraft/modules/route/controller/CpRouteController.java index 8ae6489..6b907b1 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/route/controller/CpRouteController.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/route/controller/CpRouteController.java @@ -51,8 +51,6 @@ public class CpRouteController { private CpRouteService entityService; @Autowired private CpRouteMapper cpRouteMapper; - @Autowired - private UserMapper userMapper; @ApiOperation(value = "分页查询路线(name模糊查询)", notes = "分页查询路线,可根据路线名称进行模糊搜索") @RequestMapping(method = RequestMethod.GET) @@ -134,12 +132,9 @@ public class CpRouteController { BeanUtils.copyProperties(cpRouteDTO, cpRoute); // 设置路线基础信息 cpRoute.setCreateTime(LocalDateTime.now()); + cpRoute.setUpdateTime(LocalDateTime.now()); cpRoute.setDelFlag(0); - Long creatorId = getCurrentUserId(); - String createBy = userMapper.getNameById(creatorId);//创建人的名 - cpRoute.setCreateBy(createBy); - // 保存路线主信息 entityService.save(cpRoute); @@ -188,6 +183,7 @@ public class CpRouteController { error.put("msg", "路线不存在"); // 调整响应描述 return ResponseEntity.status(404).body(error); } + entity.setUpdateTime(LocalDateTime.now()); entityService.updateById(entity); Map success = new HashMap<>(); success.put("code", 200); diff --git a/aircraft-system/src/main/java/com/aircraft/modules/route/domain/CpRoute.java b/aircraft-system/src/main/java/com/aircraft/modules/route/domain/CpRoute.java index e18e3ba..653b8b4 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/route/domain/CpRoute.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/route/domain/CpRoute.java @@ -3,11 +3,8 @@ package com.aircraft.modules.route.domain; import java.math.BigDecimal; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.*; import com.aircraft.base.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -67,9 +64,11 @@ public class CpRoute { @ApiModelProperty(value = "备注") private String remark; + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建者,默认null") private String createBy; + @TableField(fill = FieldFill.INSERT_UPDATE) @ApiModelProperty(value = "更新者,默认null") private String updateBy;