server/platform/src/main/java/com/doumee/api/business/CompanyController.java
@@ -32,14 +32,14 @@ @PreventRepeat @ApiOperation("新建") @PostMapping("/create") @RequiresPermissions("company:company:create") @RequiresPermissions("business:company:create") public ApiResponse create(@RequestBody @Valid CompanyCreatOrUpdateRequest company) { return ApiResponse.success(companyService.create(company)); } @ApiOperation("根据ID删除") @GetMapping("/delete/{id}") @RequiresPermissions("company:company:delete") @RequiresPermissions("business:company:delete") public ApiResponse deleteById(@PathVariable Integer id) { companyService.deleteById(id); return ApiResponse.success(null); @@ -47,7 +47,7 @@ @ApiOperation("批量删除") @GetMapping("/delete/batch") @RequiresPermissions("company:company:delete") @RequiresPermissions("business:company:delete") public ApiResponse deleteByIdInBatch(@RequestParam String ids) { companyService.deleteByIdInBatch(this.getIdList(ids)); return ApiResponse.success(null); @@ -55,7 +55,7 @@ @ApiOperation("根据ID修改") @PostMapping("/updateById") @RequiresPermissions("company:company:update") @RequiresPermissions("business:company:update") public ApiResponse updateById(@RequestBody Company company) { companyService.updateById(company); return ApiResponse.success(null); @@ -63,14 +63,14 @@ @ApiOperation("分页查询") @PostMapping("/page") @RequiresPermissions("company:company:query") @RequiresPermissions("business:company:query") public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap) { return ApiResponse.success(companyService.findPage(pageWrap)); } @ApiOperation("根据ID查询") @GetMapping("/{id}") @RequiresPermissions("company:company:query") @RequiresPermissions("business:company:query") public ApiResponse findById(@PathVariable Integer id) { return ApiResponse.success(companyService.findById(id)); } @@ -84,7 +84,7 @@ */ @ApiOperation("平台查询企业信息-分页查询") @PostMapping("/findPlatformPage") // @RequiresPermissions("company:company:query") @RequiresPermissions("business:company:query") public ApiResponse<PageData<Company>> findPlatformPage(@RequestBody PageWrap<Company> pageWrap){ return ApiResponse.success(companyService.findPlatformPage(pageWrap)); } @@ -98,8 +98,21 @@ */ @ApiOperation("根据企业企业id 查询企业用户") @PostMapping("/findPlatformById") @RequiresPermissions("company:company:query") @RequiresPermissions("business:company:query") public ApiResponse<Company> findPlatformById(@RequestParam Integer companyId){ return ApiResponse.success(companyService.findPlatformById(companyId)); } /** * 主键更新 * * @param company 实体对象 */ @ApiOperation("根据ID修改-编辑") @PostMapping("/update") @RequiresPermissions("business:company:update") public ApiResponse update(@RequestBody CompanyCreatOrUpdateRequest company){ companyService.updateById(company); return ApiResponse.success(null); } } server/platform/src/main/java/com/doumee/api/business/CompanyUserController.java
@@ -34,9 +34,9 @@ * @param pageWrap 分页对象 * @return PageData<Company> */ @ApiOperation("分页查询") @ApiOperation("企业用户分页查询") @PostMapping("/page") // @RequiresPermissions("company:company:query") @RequiresPermissions("business:companyUser:query") public ApiResponse<PageData<CompanyUserDTO>> findPage(@RequestBody PageWrap<CompanyUserQueryDTO> pageWrap){ return ApiResponse.success(companyUserService.findPage(pageWrap)); } @@ -48,9 +48,9 @@ * @param userId 实体对象 * @return Company */ @ApiOperation("分页查询") @ApiOperation("根据企业用户ID") @PostMapping("/findByUserId") // @RequiresPermissions("company:company:query") @RequiresPermissions("business:companyUser:query") public ApiResponse<CompanyUserDTO> findByUserId(@RequestParam("userId") Integer userId){ CompanyUserDTO company = new CompanyUserDTO(); @@ -64,9 +64,9 @@ * @param companyId 实体对象 * @return List<Company> */ @ApiOperation("分页查询") @ApiOperation("根据企业查询") @GetMapping("/findListByCompanyID") // @RequiresPermissions("company:company:query") @RequiresPermissions("business:companyUser:query") public ApiResponse<List<CompanyUserDTO>> findListByCompanyID(@RequestParam("companyId") Integer companyId){ CompanyUserDTO company = new CompanyUserDTO(); company.setCompanyId(companyId); server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -42,9 +42,9 @@ @ApiOperation("查询菜单树") @GetMapping("/treeNodes") public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu () { public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu (@RequestParam Integer type) { LoginUserInfo loginUserInfo = this.getLoginUser(); return ApiResponse.success(systemMenuBiz.findTree(loginUserInfo.getId(),loginUserInfo.getType())); return ApiResponse.success(systemMenuBiz.findTree(loginUserInfo.getId(),type)); } @ApiOperation("查询列表树") server/platform/src/main/java/com/doumee/api/system/SystemPermissionController.java
@@ -7,6 +7,7 @@ import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.dao.system.dto.QuerySystemPermissionDTO; import com.doumee.dao.system.model.SystemPermission; import com.doumee.dao.system.vo.SystemPermissionListVO; @@ -88,4 +89,14 @@ systemPermission.setDeleted(Boolean.FALSE); return ApiResponse.success(systemPermissionService.findList(systemPermission)); } @ApiOperation("查询所有") @GetMapping("/allCom") @RequiresPermissions("system:permission:query") public ApiResponse<List<SystemPermission>> findAllCom () { SystemPermission systemPermission = new SystemPermission(); systemPermission.setType(Constants.ONE); systemPermission.setDeleted(Boolean.FALSE); return ApiResponse.success(systemPermissionService.findList(systemPermission)); } } server/platform/src/main/java/com/doumee/api/system/SystemUserController.java
@@ -112,9 +112,16 @@ @ApiOperation("分页查询系统用户") @PostMapping("/findAllPage") @RequiresPermissions("system:user:query") public ApiResponse<PageData<SystemUser>> findAllPage (@RequestBody PageWrap<SystemUser> pageWrap) { return ApiResponse.success(systemUserService.findAllList(pageWrap)); } @ApiOperation("查询系统用户") @PostMapping("/findAllList") @RequiresPermissions("system:user:query") public ApiResponse<PageData<SystemUser>> findAllList (@RequestBody PageWrap<SystemUser> pageWrap) { public ApiResponse<List<SystemUser>> findAllList (@RequestBody SystemUser pageWrap) { return ApiResponse.success(systemUserService.findAllList(pageWrap)); }
@@ -40,6 +40,10 @@ public static final String GOODS_PRICE_RATE = "GOODS_PRICE_RATE"; public static final String COMPANY_MANAGE_ROLE = "COMPANY_MANAGE_ROLE"; public static final String DEFAULT_MANAGE_ROLE = "DEFAULT_MANAGE_ROLE"; public static final String DEFAULT_PASSWORD = "DEFAULT_PASSWORD"; /** * 企业数据来源 0平台注册 1后台导入 */ server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyCreatOrUpdateRequest.java
@@ -34,9 +34,12 @@ @ApiModelProperty(value = "备注") private String remark; @ApiModelProperty(value = "管理员账号（关联system_user表)", example = "1") @ApiModelProperty(value = "管理员账号ID（关联system_user表)", example = "1") private Integer managerId; @ApiModelProperty(value = "管理员账号（关联system_user表)", example = "1") private String managerUserName; @ApiModelProperty(value = "联系人") private String linkname;
@@ -22,4 +22,6 @@ @ApiModelProperty(value = "0 启用 1 禁用") private Integer status; @ApiModelProperty(value = "类型 0平台用户 1企业用户 2主播") private Integer type; } server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -28,6 +28,7 @@ import com.doumee.service.business.CompanyService; import com.doumee.service.system.SystemDictService; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -68,9 +69,8 @@ @Override public Integer create(CompanyCreatOrUpdateRequest company) { LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); Company insert = new Company(); if (Objects.isNull(company.getManagerId())){ if (StringUtils.isBlank(company.getManagerUserName())){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"登录账号不允许为空"); } if (Objects.isNull(company.getOepnValidDate())){ @@ -79,7 +79,25 @@ if (Objects.isNull(company.getUserNum())){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"主播账号数量不允许为空"); } QueryWrapper<Company> wrapper = new QueryWrapper<>(); wrapper.lambda() .eq(Company::getDeleted,Boolean.FALSE) .eq(Company::getName,company.getName()); Company company1 = companyMapper.selectOne(wrapper); if (Objects.nonNull(company1)){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"企业已存在请重新输入"); } wrapper.clear(); wrapper.lambda() .eq(Company::getDeleted,Boolean.FALSE) .eq(Company::getCreditCode,company.getCreditCode()); Company company2 = companyMapper.selectOne(wrapper); if (Objects.nonNull(company2)){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"企业已存在请重新输入"); } Company insert = new Company(); insert.setDeleted((byte)Constants.ZERO); insert.setCreateUser(userInfo.getId()); insert.setCreateTime(new Date()); @@ -88,7 +106,7 @@ insert.setName(company.getName()); insert.setShortName(company.getShortName()); insert.setRemark(company.getRemark()); insert.setManagerId(company.getManagerId()); // insert.setManagerId(company.getManagerId()); insert.setLinkname(company.getLinkname()); insert.setLinkephone(company.getLinkephone()); insert.setCreditCode(company.getCreditCode()); @@ -97,29 +115,56 @@ insert.setOepnType(company.getOepnType()); insert.setSalesmanId(company.getSalesmanId()); companyMapper.insert(insert); UpdateWrapper<SystemUser> systemUserQuery = new UpdateWrapper<>(); systemUserQuery.lambda() .eq(SystemUser::getId,company.getManagerId()) .set(SystemUser::getCompanyId,insert.getId()); systemUserMapper.update(null,systemUserQuery); //创建企业用户 SystemUser companyUser = createCompanyUser(company.getManagerUserName(), insert.getId()); Company update = new Company(); update.setId(insert.getId()); update.setManagerId(companyUser.getId()); companyMapper.updateById(update); SystemDictData dictData = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.COMPANY_MANAGE_ROLE); SystemUserRole systemUserRole = new SystemUserRole(); systemUserRole.setUserId(company.getManagerId()); systemUserRole.setUserId(companyUser.getId()); systemUserRole.setRoleId(Integer.valueOf(dictData.getCode())); systemUserRole.setCreateTime(new Date()); systemUserRole.setUpdateTime(new Date()); systemUserRole.setCreateUser(userInfo.getId()); systemUserRole.setUpdateUser(userInfo.getId()); systemUserRole.setDeleted(Boolean.FALSE); systemUserRoleMapper.insert(systemUserRole); return company.getId(); } private SystemUser createCompanyUser(String managerUserName,Integer companyId){ QueryWrapper<SystemUser> query = new QueryWrapper<>(); query.lambda() .eq(SystemUser::getDeleted,Boolean.FALSE) .eq(SystemUser::getUsername,managerUserName); Integer integer = systemUserMapper.selectCount(query); if (integer > Constants.ZERO){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"账号已存在请重新输入账号"); } LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); SystemDictData dictDataPassword = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.DEFAULT_PASSWORD); String salt = RandomStringUtils.randomAlphabetic(6); SystemUser user = new SystemUser(); user.setUsername(managerUserName); user.setPassword(Utils.Secure.encryptPassword(dictDataPassword.getCode(), salt)); user.setSalt(salt); user.setCompanyId(companyId); user.setType(Constants.ONE); user.setCreateTime(new Date()); user.setUpdateTime(new Date()); user.setCreateUser(userInfo.getId()); user.setUpdateUser(userInfo.getId()); user.setDeleted(Boolean.FALSE); user.setStatus(Constants.ZERO); systemUserMapper.insert(user); return user; } @Override public void deleteById(Integer id) { companyMapper.deleteById(id); server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java
@@ -48,7 +48,7 @@ .leftJoin(SystemUserRole.class,SystemUserRole::getUserId,SystemUser::getId) .leftJoin(SystemRole.class,SystemRole::getId,SystemUserRole::getRoleId) .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId) .eq(SystemUser::getType, Constants.ONE) .eq(SystemUser::getType, pageWrap.getModel().getType()) .eq(Objects.nonNull(pageWrap.getModel().getStatus()),SystemUser::getStatus,pageWrap.getModel().getStatus()) .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName()) .like(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),SystemUser::getUsername,pageWrap.getModel().getKeyWords()) server/service/src/main/java/com/doumee/service/system/SystemUserService.java
@@ -79,6 +79,9 @@ PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap); PageData<SystemUser> findAllList(PageWrap<SystemUser> pageWrap); List<SystemUser> findAllList(SystemUser pageWrap); /** * 条件统计 server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -219,6 +219,23 @@ } @Override public List<SystemUser> findAllList(SystemUser pageWrap){ MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(SystemUser.class); queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO); queryWrapper.and(StringUtils.isNotBlank(pageWrap.getUsername()),ms->ms.like(SystemUser::getUsername,pageWrap.getUsername()) .or().like(SystemUser::getMobile,pageWrap.getUsername()) .or().like(SystemUser::getRealname,pageWrap.getUsername()) ); queryWrapper.orderByDesc(SystemUser::getCreateTime); List<SystemUser> result = systemUserJoinMapper.selectJoinList(SystemUser.class, queryWrapper); return result; }
@@ -30,6 +30,9 @@ <if test="dto.name != null and dto.name != ''"> AND role.`NAME` LIKE CONCAT('%', #{dto.name}, '%') </if> <if test="dto.type != null and dto.type != ''"> AND role.type = #{dto.type} </if> </where> ${orderByClause} </select>
