Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、禅道#582、#583、#584、#587问题修复；2、无用字段移除：needSetPwd、password；

Browse Source
This commit is contained in:
gaoqr
2024-11-25 11:27:59 +08:00
parent ca0acb5896
commit b6a81f2151
8 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
-2
View File
@@ -505,7 +505,6 @@ public class OrderController {
// 生产单超期（工作台）
@GetMapping("/getOrderOverdue")
@Operation(summary = "生产单超期 （工作台）")
@PreAuthorize("@ss.hasPermission('productManager:List')")
public CommonResult<PageResult<OrderOverdueRespVO>> getOrderOverdue(@Valid PageParam pageParam) {
return success(orderService.getOrderOverdue(pageParam));
}
@@ -513,7 +512,6 @@ public class OrderController {
// 生产单到期告警 （工作台）
@GetMapping("/getOrderWarn")
@Operation(summary = "生产单到期告警 （工作台）")
@PreAuthorize("@ss.hasPermission('productManager:List')")
public CommonResult<PageResult<OrderOverdueRespVO>> getOrderNear(@Valid PageParam pageParam) {
return success(orderService.getOrderNear(pageParam));
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
+5 -5
View File
@@ -22,14 +22,14 @@ import javax.validation.constraints.Pattern;
public class AuthLoginReqVO {
@Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "chenfengyuanma")
@NotEmpty(message = "登录账号不能为空")
@Length(min = 4, max = 16, message = "账号长度为 4-16 位")
@Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")
@NotEmpty(message = "登录失败，账号密码不正确")
@Length(max = 11, message = "登录失败，账号密码不正确")
@Pattern(regexp = "^[A-Za-z0-9]+$", message = "登录失败，账号密码不正确")
private String username;
@Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao")
@Length(min = 4, max = 16, message = "密码长度为 4-16 位")
@NotEmpty(message = "密码不能为空")
@Length(min = 8, max = 16, message = "登录失败，账号密码不正确")
@NotEmpty(message = "登录失败，账号密码不正确")
private String password;
// ========== 图片验证码相关 ==========
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java
-3
View File
@@ -48,9 +48,6 @@ public class AuthPermissionInfoRespVO {
@Schema(description = "组织id")
private Long organId;
@Schema(description = "是否需要设置密码")
private boolean needSetPwd;
@Schema(description = "ip地址")
private String ip;
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/NoticeController.java
-2
View File
@@ -62,7 +62,6 @@ public class NoticeController {
@GetMapping("/page")
@Operation(summary = "获取通知公告列表")
@PreAuthorize("@ss.hasPermission('system:notice:query')")
public CommonResult<PageResult<NoticeRespVO>> getNoticePage(@Validated NoticePageReqVO pageReqVO) {
PageResult<NoticeDO> pageResult = noticeService.getNoticePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, NoticeRespVO.class));
@@ -71,7 +70,6 @@ public class NoticeController {
@GetMapping("/get")
@Operation(summary = "获得通知公告")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('system:notice:query')")
public CommonResult<NoticeRespVO> getNotice(@RequestParam("id") Long id) {
NoticeDO notice = noticeService.getNotice(id);
return success(BeanUtils.toBean(notice, NoticeRespVO.class));
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
-5
View File
@@ -36,7 +36,6 @@ public class UserSaveReqVO {
@Schema(description = "用户邮箱", example = "chenfeng@cf.com")
@Email(message = "邮箱格式不正确")
@Size(max = 50, message = "邮箱长度不能超过 50 个字符")
@NotBlank(message = "邮箱不能为空")
private String email;
@Schema(description = "手机号码", example = "15601691300")
@@ -54,10 +53,6 @@ public class UserSaveReqVO {
// ========== 仅【创建】时，需要传递的字段 ==========
@Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
@Size(min = 4, max = 16, message = "密码长度为 4-16 位")
private String password;
@Schema(description = "帐号状态（0正常 1停用）")
@NotNull(message = "账号状态不能空")
@CommonStatus
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/auth/AuthConvert.java
+1 -1
View File
@@ -49,7 +49,7 @@ public interface AuthConvert {
return AuthPermissionInfoRespVO.builder()
.user(AuthPermissionInfoRespVO.UserVO.builder()
.id(user.getId()).nickname(user.getNickname()).avatar(user.getAvatar()).organId(user.getOrganId()).needSetPwd(StringUtils.isEmpty(user.getPassword()))
.id(user.getId()).nickname(user.getNickname()).avatar(user.getAvatar()).organId(user.getOrganId())
.expireTime(organizationDO.getExpireTime()).ip(ipQuerySuccess ? ipQueryDataRespDTO.getIp() : "")
.region(region)
.build())
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java
-2
View File
@@ -490,8 +490,6 @@ public class AdminUserServiceImpl implements AdminUserService {
validateUserExists(id);
// 校验用户名唯一
validateUsernameUnique(id, username, organId);
// 校验邮箱唯一
validateEmailUnique(id, email, organId);
// 校验部门处于开启状态
deptService.validateDeptList(CollectionUtils.singleton(deptId));
// 校验岗位处于开启状态
cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/user/AdminUserServiceImplTest.java
-2
View File
@@ -106,8 +106,6 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
}));
//when(postService.getPostList(eq(reqVO.getPostIds()), isNull())).thenReturn(posts);
// mock passwordEncoder 的方法
when(passwordEncoder.encode(eq(reqVO.getPassword()))).thenReturn("chenfengyuanma");
// 调用
Long userId = userService.createUser(reqVO);