diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java index e230ee9..d1fe290 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java @@ -14,7 +14,9 @@ import com.muyu.system.domain.model.*; import com.muyu.system.domain.rep.SysPostEditReq; import com.muyu.system.domain.rep.SysPostListReq; import com.muyu.system.domain.rep.SysPostSaveReq; -import com.muyu.system.domain.resp.SysPostListResp;import com.muyu.system.service.SysPostService; +import com.muyu.system.domain.resp.SysPostListResp; +import com.muyu.system.domain.resp.SysPostMyInfoResp; +import com.muyu.system.service.SysPostService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -58,8 +60,8 @@ public class SysPostController extends BaseController { */ @RequiresPermissions("system:post:query") @GetMapping(value = "/{postId}") - public Result getInfo (@PathVariable("postId") Long postId) { - return success(postService.selectPostById(postId)); + public Result getInfo (@PathVariable("postId") Long postId) { + return success(SysPostMyInfoResp.messageBuild(postService.selectPostById(postId))); } /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java index f3e14e6..763c550 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java @@ -13,7 +13,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.*; -import lombok.experimental.SuperBuilder; +import lombok.experimental.SuperBuilder;import java.util.Date; /** * 岗位表 sys_post @@ -92,6 +92,8 @@ public class SysPost extends BaseEntity { .status(sysPostSaveModel.getStatus()) .flag(sysPostSaveModel.isFlag()) .createBy(sysPostSaveModel.getCreateBy()) + .createTime(new Date()) + .remark(sysPostSaveModel.getRemark()) .build(); } public static SysPost editBuild(SysPostEditModel sysPostEditModel) { @@ -102,7 +104,9 @@ public class SysPost extends BaseEntity { .postSort(sysPostEditModel.getPostSort()) .status(sysPostEditModel.getStatus()) .flag(sysPostEditModel.isFlag()) - .createBy(sysPostEditModel.getUpdateBy()) + .updateBy(sysPostEditModel.getUpdateBy()) + .updateTime(new Date()) + .remark(sysPostEditModel.getRemark()) .build(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostEditModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostEditModel.java index 671ebf0..60f114d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostEditModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostEditModel.java @@ -59,6 +59,11 @@ public class SysPostEditModel { */ private String updateBy; + /** + * 备注 + */ + private String remark; + public static SysPostEditModel editBuild(SysPostEditReq sysPostEditReq) { return SysPostEditModel.builder() .postId(sysPostEditReq.getPostId()) @@ -68,6 +73,7 @@ public class SysPostEditModel { .status(sysPostEditReq.getStatus()) .flag(sysPostEditReq.isFlag()) .updateBy(sysPostEditReq.getUpdateBy()) + .remark(sysPostEditReq.getRemark()) .build(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostListModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostListModel.java index 9fa28f5..50b91f3 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostListModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostListModel.java @@ -1,9 +1,12 @@ package com.muyu.system.domain.model; +import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.annotation.Excel; import com.muyu.system.domain.SysPost; import lombok.*; -import lombok.experimental.SuperBuilder; /** +import lombok.experimental.SuperBuilder; + +import java.util.Date; /** * 岗位信息列表模型 * @author: AoCi Tian * @create: 2025-02-23 19:31 @@ -51,6 +54,12 @@ public class SysPostListModel { @Builder.Default private boolean flag = false; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + public static SysPostListModel listBuild(SysPost sysPost) { return SysPostListModel.builder() .postId(sysPost.getPostId()) @@ -59,6 +68,7 @@ public class SysPostListModel { .postSort(sysPost.getPostSort()) .status(sysPost.getStatus()) .flag(sysPost.isFlag()) + .createTime(sysPost.getCreateTime()) .build(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostMyInfoModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostMyInfoModel.java index 12c42f0..dc2a618 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostMyInfoModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostMyInfoModel.java @@ -53,6 +53,12 @@ public class SysPostMyInfoModel { @Builder.Default private boolean flag = false; + /** + * 备注 + */ + @Excel(name = "备注") + private String remark; + public static SysPostMyInfoModel build(SysPost sysPost) { return SysPostMyInfoModel.builder() .postId(sysPost.getPostId()) @@ -60,6 +66,7 @@ public class SysPostMyInfoModel { .postName(sysPost.getPostName()) .postSort(sysPost.getPostSort()) .status(sysPost.getStatus()) + .remark(sysPost.getRemark()) .flag(sysPost.isFlag()) .build(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostSaveModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostSaveModel.java index c57938e..1d727b4 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostSaveModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostSaveModel.java @@ -59,6 +59,11 @@ public class SysPostSaveModel { */ private String createBy; + /** + * 备注 + */ + private String remark; + public static SysPostSaveModel saveBuild(SysPostSaveReq sysPostSaveReq) { return SysPostSaveModel.builder() .postId(sysPostSaveReq.getPostId()) @@ -68,6 +73,7 @@ public class SysPostSaveModel { .status(sysPostSaveReq.getStatus()) .flag(sysPostSaveReq.isFlag()) .createBy(sysPostSaveReq.getCreateBy()) + .remark(sysPostSaveReq.getRemark()) .build(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostEditReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostEditReq.java index 05c9e04..e09a8dc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostEditReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostEditReq.java @@ -58,15 +58,9 @@ public class SysPostEditReq { */ private String updateBy; - public static SysPostEditReq editBuild(SysPost sysPost) { - return SysPostEditReq.builder() - .postId(sysPost.getPostId()) - .postCode(sysPost.getPostCode()) - .postName(sysPost.getPostName()) - .postSort(sysPost.getPostSort()) - .status(sysPost.getStatus()) - .flag(sysPost.isFlag()) - .updateBy(sysPost.getUpdateBy()) - .build(); - } + /** + * 备注 + */ + private String remark; + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostSaveReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostSaveReq.java index 8116a6d..7f6adab 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostSaveReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostSaveReq.java @@ -61,15 +61,9 @@ public class SysPostSaveReq { */ private String createBy; - public static SysPostSaveReq saveBuild(SysPost sysPost) { - return SysPostSaveReq.builder() - .postId(sysPost.getPostId()) - .postCode(sysPost.getPostCode()) - .postName(sysPost.getPostName()) - .postSort(sysPost.getPostSort()) - .status(sysPost.getStatus()) - .flag(sysPost.isFlag()) - .createBy(sysPost.getCreateBy()) - .build(); - } + /** + * 备注 + */ + private String remark; + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysPostListResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysPostListResp.java index e92872b..c70abdc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysPostListResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysPostListResp.java @@ -1,5 +1,6 @@ package com.muyu.system.domain.resp; +import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.system.domain.SysPost; @@ -9,6 +10,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; import java.util.List; /** * 岗位信息响应列表 @@ -58,6 +60,12 @@ public class SysPostListResp { @Builder.Default private boolean flag = false; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + public static SysPostListResp listBuild(SysPostListModel sysPostListModel) { return SysPostListResp.builder() .postId(sysPostListModel.getPostId()) @@ -66,6 +74,7 @@ public class SysPostListResp { .postSort(sysPostListModel.getPostSort()) .status(sysPostListModel.getStatus()) .flag(sysPostListModel.isFlag()) + .createTime(sysPostListModel.getCreateTime()) .build(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysPostMyInfoResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysPostMyInfoResp.java new file mode 100644 index 0000000..e66ca11 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysPostMyInfoResp.java @@ -0,0 +1,73 @@ +package com.muyu.system.domain.resp; + +import com.muyu.common.core.annotation.Excel; +import com.muyu.system.domain.model.SysPostMyInfoModel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; /** + * 个人岗位信息 + * @author: AoCi Tian + * @create: 2025-02-23 20:52 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SysPostMyInfoResp { + private static final long serialVersionUID = 1L; + + /** + * 岗位序号 + */ + @Excel(name = "岗位序号", cellType = Excel.ColumnType.NUMERIC) + private Long postId; + + /** + * 岗位编码 + */ + @Excel(name = "岗位编码") + private String postCode; + + /** + * 岗位名称 + */ + @Excel(name = "岗位名称") + private String postName; + + /** + * 岗位排序 + */ + @Excel(name = "岗位排序") + private Integer postSort; + + /** + * 状态(0正常 1停用) + */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** + * 用户是否存在此岗位标识 默认不存在 + */ + @Builder.Default + private boolean flag = false; + + /** + * 备注 + */ + @Excel(name = "备注") + private String remark; + + public static SysPostMyInfoResp messageBuild(SysPostMyInfoModel sysPostMyInfoModel) { + return SysPostMyInfoResp.builder() + .postId(sysPostMyInfoModel.getPostId()) + .postCode(sysPostMyInfoModel.getPostCode()) + .postName(sysPostMyInfoModel.getPostName()) + .postSort(sysPostMyInfoModel.getPostSort()) + .status(sysPostMyInfoModel.getStatus()) + .remark(sysPostMyInfoModel.getRemark()) + .flag(sysPostMyInfoModel.isFlag()) + .build(); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java index 10aa4a3..804d5a6 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java @@ -160,7 +160,7 @@ public class SysPostServiceImpl extends ServiceImpl impl @Override public void deletePostByIds (List postIds) { for (Long postId : postIds) { - SysPost post = selectPostById(postId); + SysPostMyInfoModel post = selectPostById (postId); if (countUserPostById(postId) > 0) { throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName())); }