From b194be9efbf3114dfdfb4e58eb7802459b78a87a Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 15 九月 2023 15:36:10 +0800
Subject: [PATCH] #联调修改
---
server/platform/src/main/java/com/doumee/api/business/CompanyController.java | 29 +++++++--
server/platform/src/main/java/com/doumee/api/system/SystemPermissionController.java | 11 +++
server/platform/src/main/java/com/doumee/api/business/CompanyUserController.java | 12 ++--
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 71 +++++++++++++++++++----
server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserQueryDTO.java | 2
server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java | 2
server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyCreatOrUpdateRequest.java | 5 +
server/service/src/main/java/com/doumee/service/system/SystemUserService.java | 5 +
server/service/src/main/resources/mappers/SystemRoleMapper.xml | 3 +
server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java | 4
server/platform/src/main/java/com/doumee/api/system/SystemUserController.java | 9 ++
server/service/src/main/java/com/doumee/core/utils/Constants.java | 4 +
server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 17 +++++
13 files changed, 141 insertions(+), 33 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java b/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
index e729cef..d2f12fc 100644
--- a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/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);
+ }
}
diff --git a/server/platform/src/main/java/com/doumee/api/business/CompanyUserController.java b/server/platform/src/main/java/com/doumee/api/business/CompanyUserController.java
index 0ab78d3..0a8b390 100644
--- a/server/platform/src/main/java/com/doumee/api/business/CompanyUserController.java
+++ b/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);
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
index b21c9a9..b32b1e2 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/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("鏌ヨ鍒楄〃鏍�")
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemPermissionController.java b/server/platform/src/main/java/com/doumee/api/system/SystemPermissionController.java
index 327e24a..b4133a3 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemPermissionController.java
+++ b/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));
+ }
}
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java b/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java
index 788a68b..a70010a 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java
+++ b/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));
}
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 93c5fb8..38dd80d 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -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鍚庡彴瀵煎叆
*/
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyCreatOrUpdateRequest.java b/server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyCreatOrUpdateRequest.java
index 9177ccc..9c57c3c 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyCreatOrUpdateRequest.java
+++ b/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 = "绠＄悊鍛樿处鍙稩D锛堝叧鑱攕ystem_user琛�)", example = "1")
private Integer managerId;
+ @ApiModelProperty(value = "绠＄悊鍛樿处鍙凤紙鍏宠仈system_user琛�)", example = "1")
+ private String managerUserName;
+
@ApiModelProperty(value = "鑱旂郴浜�")
private String linkname;
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserQueryDTO.java b/server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserQueryDTO.java
index 85b25af..a84229c 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserQueryDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserQueryDTO.java
@@ -22,4 +22,6 @@
@ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
private Integer status;
+ @ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛 2涓绘挱")
+ private Integer type;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 7dfd956..9a8694d 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/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);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java
index 99e4c0a..e82e992 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java
+++ b/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())
diff --git a/server/service/src/main/java/com/doumee/service/system/SystemUserService.java b/server/service/src/main/java/com/doumee/service/system/SystemUserService.java
index ffb0d32..539c5ee 100644
--- a/server/service/src/main/java/com/doumee/service/system/SystemUserService.java
+++ b/server/service/src/main/java/com/doumee/service/system/SystemUserService.java
@@ -70,7 +70,7 @@
* @date 2023/03/21 14:49
*/
List<SystemUser> findList(SystemUser systemUser);
-
+
/**
* 鍒嗛〉鏌ヨ
* @author Eva.Caesar Liu
@@ -80,6 +80,9 @@
PageData<SystemUser> findAllList(PageWrap<SystemUser> pageWrap);
+
+ List<SystemUser> findAllList(SystemUser pageWrap);
+
/**
* 鏉′欢缁熻
* @author Eva.Caesar Liu
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index 7a8c126..491449c 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/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;
+ }
+
+
diff --git a/server/service/src/main/resources/mappers/SystemRoleMapper.xml b/server/service/src/main/resources/mappers/SystemRoleMapper.xml
index ea4849f..7c35d77 100644
--- a/server/service/src/main/resources/mappers/SystemRoleMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemRoleMapper.xml
@@ -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>
--
Gitblit v1.9.3