From 62e675e1fd3d9eb12181d9974dd0e9014a58d82e Mon Sep 17 00:00:00 2001 From: luolm <470431449@qq.com> Date: Tue, 18 Feb 2025 22:44:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E9=97=A8=EF=BC=8C=E8=81=8C?= =?UTF-8?q?=E4=BD=8D=E7=BC=96=E7=A0=81=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/mobilebroken/admin/constant/Constant.java | 9 +++++++++ .../admin/controller/DepartmentController.java | 9 +++++---- .../admin/controller/PositionController.java | 3 +++ .../nflg/mobilebroken/admin/pojo/dto/DepartmentDTO.java | 3 --- .../mobilebroken/admin/pojo/dto/PositionDetailDTO.java | 6 +----- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/constant/Constant.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/constant/Constant.java index 8b8a5800..ed04a309 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/constant/Constant.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/constant/Constant.java @@ -17,4 +17,13 @@ public class Constant { * 区域编码前缀 */ public static final String AreaCodePrefix="A"; + /** + * 部门编码前缀 + */ + public static final String DeptCodePrefix="DP"; + + /** + * 职位编码前缀 + */ + public static final String JobCodePrefix="JOB"; } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java index 920c54ae..4d8f4fd7 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.nflg.mobilebroken.admin.annotation.ApiMark; +import com.nflg.mobilebroken.admin.constant.Constant; import com.nflg.mobilebroken.admin.pojo.dto.DepartmentDTO; import com.nflg.mobilebroken.admin.pojo.query.DepartmentQuery; import com.nflg.mobilebroken.admin.pojo.vo.BaseDepartmentVO; @@ -13,6 +14,7 @@ import com.nflg.mobilebroken.common.exception.NflgException; import com.nflg.mobilebroken.common.pojo.ApiResult; import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.util.AdminUserUtil; +import com.nflg.mobilebroken.common.util.UniqueSequenceGenerator; import com.nflg.mobilebroken.common.util.VUtils; import com.nflg.mobilebroken.repository.entity.TBaseDepartment; import com.nflg.mobilebroken.repository.service.ITBaseDepartmentService; @@ -74,17 +76,16 @@ public class DepartmentController extends ControllerBase { @ApiMark(moduleName = "部门管理", apiName = "新增") public ApiResult add(@Valid @RequestBody DepartmentDTO departmentDTO){ - List checkCode = departmentService.lambdaQuery().eq(TBaseDepartment::getDeptCode, departmentDTO.getDeptCode()).list(); +// List checkCode = departmentService.lambdaQuery().eq(TBaseDepartment::getDeptCode, departmentDTO.getDeptCode()).list(); //新增 TBaseDepartment dept = Convert.convert(TBaseDepartment.class, departmentDTO); if(null==departmentDTO.getId() || departmentDTO.getId()==0){ - VUtils.trueThrowBusinessError(CollUtil.isNotEmpty(checkCode)).throwMessage("编码已存在"); + dept.setDeptCode(UniqueSequenceGenerator.generateCode(Constant.DeptCodePrefix)); dept.setDataCreateUserNo(AdminUserUtil.getUserNo()); dept.setDataCreateUserName(AdminUserUtil.getUserName()); dept.setDataCreateTime(LocalDateTime.now()); } else { - dept.setDataModifyUserNo(AdminUserUtil.getUserNo()); dept.setDataModifyUserName(AdminUserUtil.getUserName()); dept.setDataModifyTime(LocalDateTime.now()); @@ -130,7 +131,7 @@ public class DepartmentController extends ControllerBase { @PostMapping("enable") @MethodInfoMark(value = "启用",menuName = "部门管理") @ApiMark(moduleName = "部门管理", apiName = "启用") - public ApiResult enable(@RequestBody List ids ){ + public ApiResult enable(@RequestBody List ids ){ VUtils.trueThrowBusinessError(CollUtil.isEmpty(ids)).throwMessage("请选择要启用的数据"); List tBaseDepartments = departmentService.getBaseMapper().selectByIds(ids); tBaseDepartments.forEach(u->{ diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java index 9de29ec2..e03a5f98 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java @@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.mobilebroken.admin.annotation.ApiMark; +import com.nflg.mobilebroken.admin.constant.Constant; import com.nflg.mobilebroken.admin.pojo.dto.PositionDetailDTO; import com.nflg.mobilebroken.admin.pojo.query.PositionQuery; import com.nflg.mobilebroken.admin.pojo.vo.PositionDetailVO; @@ -15,6 +16,7 @@ import com.nflg.mobilebroken.common.constant.STATE; import com.nflg.mobilebroken.common.pojo.ApiResult; import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.util.AdminUserUtil; +import com.nflg.mobilebroken.common.util.UniqueSequenceGenerator; import com.nflg.mobilebroken.common.util.VUtils; import com.nflg.mobilebroken.repository.entity.Language; import com.nflg.mobilebroken.repository.entity.TBasePosition; @@ -112,6 +114,7 @@ public class PositionController extends ControllerBase { public ApiResult add(@Valid @RequestBody PositionDetailDTO positionDetailDto) { TBasePosition ent = Convert.convert(TBasePosition.class, positionDetailDto); ent.setPositionLanguage(JSON.toJSONString(positionDetailDto.getLanguage())); + ent.setPositionCode(UniqueSequenceGenerator.generateCode(Constant.JobCodePrefix)); ent.setDataCreateUserNo(AdminUserUtil.getUserNo()); ent.setDataCreateUserName(AdminUserUtil.getUserName()); ent.setDataCreateTime(LocalDateTime.now()); diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DepartmentDTO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DepartmentDTO.java index 88be76aa..58e22455 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DepartmentDTO.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DepartmentDTO.java @@ -9,9 +9,6 @@ public class DepartmentDTO { private Long id; - @NotBlank(message = "编码不能为空") - private String deptCode; - @NotBlank(message = "名称不能为空") private String deptName; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/PositionDetailDTO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/PositionDetailDTO.java index 36370941..8dcb1e29 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/PositionDetailDTO.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/PositionDetailDTO.java @@ -16,11 +16,7 @@ import java.util.List; public class PositionDetailDTO { private Integer id=0; - /** - * 职位编码 - */ - @NotBlank(message = "职位编码不能为空") - private String positionCode; + /** * 职位名称 From cc026f8aba50a12854748365e7151a61a815179b Mon Sep 17 00:00:00 2001 From: luolm <470431449@qq.com> Date: Tue, 18 Feb 2025 22:50:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=83=A8=E9=97=A8=EF=BC=8C=E8=81=8C?= =?UTF-8?q?=E4=BD=8D=E7=BC=96=E7=A0=81=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/mobilebroken/common/util/UniqueSequenceGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/UniqueSequenceGenerator.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/UniqueSequenceGenerator.java index 88fd97db..cb363138 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/UniqueSequenceGenerator.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/UniqueSequenceGenerator.java @@ -7,7 +7,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class UniqueSequenceGenerator { - private static final SimpleDateFormat sdf = new SimpleDateFormat("MMddHHmmssSSS"); + private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");