From e5ee49837556b24349eb45b777c9081f72def4c9 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 12 十二月 2022 12:00:58 +0800
Subject: [PATCH] fix: 密码验证和部门修改状态和图片删除和视频删除 车辆批量删除
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 23 ++++++++++++-----------
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 12 +++++++++++-
ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java | 3 +--
ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java | 2 +-
ycl-common/src/main/java/com/ycl/dto/UpdateAdminPasswordParam.java | 2 ++
ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java | 14 ++++++++++++++
ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java | 2 +-
7 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
index fc07da8..efa07b1 100644
--- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -83,6 +83,16 @@
return CommonResult.success(departService.removeBatchByIds(ids));
}
+ @ApiOperation("鎵瑰鐞�-寮�鍚垨鑰呯鐢ㄩ儴闂�")
+ @PutMapping(value = "/batch_status")
+ @LogSave(operationType = "閮ㄩ棬绠＄悊", contain = "鎵归噺寮�鍚垨鑰呯鐢ㄩ儴闂�")
+ public CommonResult updateBatch(@RequestParam List<UmsDepart> umsDepartList) {
+ if (umsDepartList.isEmpty()) {
+ return CommonResult.failed("bad request parameter");
+ }
+ return CommonResult.success(departService.updateBatchById(umsDepartList));
+ }
+
@ApiOperation("璇︽儏")
@PostMapping(value = "/detail")
@LogSave(operationType = "閮ㄩ棬绠＄悊", contain = "鏌ョ湅閮ㄩ棬")
@@ -133,7 +143,7 @@
@PutMapping(value = "/user_update_depart")
public CommonResult userUpdateDepart(@RequestParam Long userId,
@RequestParam Long departId) {
- umsAdminDepartService.userUpdateDepart(userId,departId);
+ umsAdminDepartService.userUpdateDepart(userId, departId);
return CommonResult.success("update success");
}
diff --git a/ycl-common/src/main/java/com/ycl/dto/UpdateAdminPasswordParam.java b/ycl-common/src/main/java/com/ycl/dto/UpdateAdminPasswordParam.java
index d0cd575..19f1ed9 100644
--- a/ycl-common/src/main/java/com/ycl/dto/UpdateAdminPasswordParam.java
+++ b/ycl-common/src/main/java/com/ycl/dto/UpdateAdminPasswordParam.java
@@ -3,6 +3,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotEmpty;
@@ -20,6 +21,7 @@
@ApiModelProperty(value = "鏃у瘑鐮�", required = true)
private String oldPassword;
@NotEmpty
+ @Length(min = 6, max = 16)
@ApiModelProperty(value = "鏂板瘑鐮�", required = true)
private String newPassword;
}
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index 53c1bc8..3eb84eb 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -137,7 +137,7 @@
}
umsRoleMenuRelations
.stream()
- .map(item->item.getMenuId())
+ .map(item -> item.getMenuId())
.collect(Collectors.toList())
.stream()
.distinct()
@@ -297,15 +297,16 @@
return umsMenuList;
}
umsMenuList = umsMenuMapper.getMenuList(adminId);
- getCacheService().setResourceList(adminId, umsMenuList);
+ getCacheService().setResourceList(adminId, umsMenuList);
return umsMenuList;
}
@Override
public int updatePassword(UpdateAdminPasswordParam param) {
- if (StrUtil.isEmpty(param.getUsername())
- || StrUtil.isEmpty(param.getOldPassword())
- || StrUtil.isEmpty(param.getNewPassword())) {
+ if (StrUtil.isNotEmpty(param.getUsername())
+ && StrUtil.isNotEmpty(param.getOldPassword())
+ && StrUtil.isNotEmpty(param.getNewPassword())
+ && !param.getNewPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{6,16}$")) {
return -1;
}
QueryWrapper<UmsAdmin> wrapper = new QueryWrapper<>();
@@ -359,16 +360,16 @@
queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType());
}*/
UmsAdmin umsAdmin = new UmsAdmin();
- if (pageUserVO.getUserType()!=null) {
- umsAdmin.setUserType(pageUserVO.getUserType());
+ if (pageUserVO.getUserType() != null) {
+ umsAdmin.setUserType(pageUserVO.getUserType());
}
- if (pageUserVO.getKeyword()!=null&&!("".equals(pageUserVO.getKeyword()))) {
- umsAdmin.setKeyword(pageUserVO.getKeyword());
+ if (pageUserVO.getKeyword() != null && !("".equals(pageUserVO.getKeyword()))) {
+ umsAdmin.setKeyword(pageUserVO.getKeyword());
}
- if (pageUserVO.getJobTitle()!=null&&!("".equals(pageUserVO.getJobTitle()))) {
+ if (pageUserVO.getJobTitle() != null && !("".equals(pageUserVO.getJobTitle()))) {
umsAdmin.setJobTitle(pageUserVO.getJobTitle());
}
- Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,umsAdmin);
+ Page<UmsAdmin> page1 = baseMapper.selectCondPage(page, umsAdmin);
return page1;
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
index b7166bf..beaffb5 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
@@ -129,4 +129,18 @@
public CommonResult deleteSlagCar(@RequestParam Integer id) {
return CommonResult.success(iCarSlagcarService.removeById(id));
}
+
+ @ApiOperation("鎵归噺鍒犻櫎鎵ф硶杞�")
+ @DeleteMapping("/batch_deletion_enforce")
+ @LogSave(operationType = "杞﹁締绠＄悊", contain = "鎵归噺鍒犻櫎鎵ф硶杞�")
+ public CommonResult batchDeleteEnforce(@RequestParam List<Long> ids) {
+ return CommonResult.success(iCarEnforcecarService.removeBatchByIds(ids));
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎娓ｅ湡杞�")
+ @DeleteMapping("/batch_deletion_slag")
+ @LogSave(operationType = "杞﹁締绠＄悊", contain = "鎵归噺鍒犻櫎娓ｅ湡杞�")
+ public CommonResult batchDeleteSlag(@RequestParam List<Long> ids) {
+ return CommonResult.success(iCarSlagcarService.removeBatchByIds(ids));
+ }
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java b/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java
index fda1988..596f523 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java
@@ -67,5 +67,4 @@
public CommonResult delete(@RequestParam List<Integer> ids) {
return CommonResult.success(iImageResourcesService.removeBatchByIds(ids));
}
-
-}
+}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java b/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java
index f650fb1..8fe358b 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java
@@ -67,4 +67,4 @@
public CommonResult delete(@RequestParam List<Integer> ids) {
return CommonResult.success(iVideoResourcesService.removeBatchByIds(ids));
}
-}
+}
\ No newline at end of file
diff --git a/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java b/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java
index b138596..506f26a 100644
--- a/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java
+++ b/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java
@@ -30,7 +30,7 @@
@Test
void contextLoads() {
- String msg = baseCaseService.processEvent(3);
+ System.out.println("123456a".matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{6,16}$"));
}
@Test
--
Gitblit v1.8.0