fix: 密码验证和部门修改状态和图片删除和视频删除 车辆批量删除

wl

2022-12-12 e5ee49837556b24349eb45b777c9081f72def4c9

fix: 密码验证和部门修改状态和图片删除和视频删除 车辆批量删除

 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");
    }


 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;
}

 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;
    }

 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));
    }
}

 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));
    }

}
}

 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));
    }
}
}

 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