From aae41c881d4082a5ee6200cd2ef7990faa06306b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 一月 2024 11:22:49 +0800
Subject: [PATCH] 开发业务接口
---
server/platform/src/main/java/com/doumee/api/system/SystemUserController.java | 3 -
server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java | 19 ++++++++-
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 4 +
server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 34 ++++++++++++++++
platform/.env.development | 4 +-
company/.env.development | 2
6 files changed, 56 insertions(+), 10 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index e464a2e..f608e5a 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -3,4 +3,4 @@
# VUE_APP_API = 'http://192.168.0.104:10023/'
-VUE_APP_API = 'http://192.168.0.134:10023/'
+VUE_APP_API = 'http://192.168.0.104:10023/'
diff --git a/platform/.env.development b/platform/.env.development
index 0b72619..c1a5ac8 100644
--- a/platform/.env.development
+++ b/platform/.env.development
@@ -9,7 +9,7 @@
# 鐒︽澗
#VUE_APP_API = 'http://192.168.0.36:10023'
# 姹熻悕
-VUE_APP_API = 'http://192.168.0.35:10023'
+VUE_APP_API = 'http://192.168.0.154:10023'
# #娴嬭瘯鏈嶅姟鍣�
-VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
+#VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
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 3b050f1..74d0a7c 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
@@ -117,9 +117,6 @@
public ApiResponse<PageData<SystemUserListVO>> findPage (@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) {
return ApiResponse.success(systemUserService.findPage(pageWrap));
}
-
-
-
@ApiOperation("鍒嗛〉鏌ヨ绯荤粺鐢ㄦ埛")
@PostMapping("/findAllPage")
@RequiresPermissions("system:user:query")
diff --git a/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java b/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
index 968f073..10980dd 100644
--- a/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
+++ b/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
@@ -15,6 +15,7 @@
import com.doumee.service.system.SystemPermissionService;
import com.doumee.service.system.SystemRoleService;
import com.doumee.service.system.SystemUserService;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
@@ -102,10 +103,12 @@
if(!Constants.equalsInteger(user.getStatus(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璐﹀彿淇℃伅宸茶绂佺敤锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛橈紒");
}
+ List<SystemRole> roles = null;
+ List<SystemPermission> permissions =null;
// 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
- List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
- List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());
if(authenticationToken.getUserType() == 0){
+ roles = systemRoleService.findByUserId(user.getId());
+ permissions = systemPermissionService.findByUserId(user.getId());
CompanyPermission c = new CompanyPermission();
c.setUserId(user.getId());
c.setIsdeleted(Constants.ZERO);
@@ -124,6 +127,18 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟璐﹀彿淇℃伅涓嶆纭紒");
}
user.setCompany(company);
+ if(StringUtils.equals(company.getUsername(),user.getUsername())){
+ //濡傛灉鏄秴绠★紝
+ SystemRole role = new SystemRole();
+ role.setType(Constants.ONE);
+ role.setDeleted(Boolean.FALSE);
+ roles = systemRoleService.findList(role);
+ SystemPermission p = new SystemPermission();
+ permissions = systemPermissionService.findList(p);
+ }else{
+ roles = systemRoleService.findByUserId(user.getId());
+ permissions = systemPermissionService.findByUserId(user.getId());
+ }
}
LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions);
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 6becd77..3bf4e3b 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
@@ -341,7 +341,9 @@
|| StringUtils.isBlank(company.getCaptche())){
throw new BusinessException(ResponseStatus.BAD_REQUEST );
}
- SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
+ if(!debugModel){
+ SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
+ }
Company model = companyMapper.selectById(company.getId());
if(model == null || StringUtils.equals(model.getPhone(),company.getPhone()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎵嬫満鍙锋湭鍙戠敓鏀瑰彉~" );
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 01e6014..7160b8b 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -25,6 +26,7 @@
import com.github.pagehelper.PageInfo;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -102,9 +104,16 @@
@Override
public SystemUser findById(Integer id) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(SystemUser.class);
queryWrapper.eq(SystemUser::getId,id );
+ queryWrapper.eq(SystemUser::getType,loginUserInfo.getType() );
+ if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
+ //濡傛灉鏄紒涓氳处鍙�
+ queryWrapper.eq(SystemUser::getCompanyId,loginUserInfo.getCompanyId() );
+ }
queryWrapper.orderByDesc(SystemUser::getCreateTime);
SystemUser result = systemUserJoinMapper.selectJoinOne( SystemUser.class, queryWrapper);
return result;
@@ -118,6 +127,12 @@
@Override
public List<SystemUser> findList(SystemUser systemUser) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ systemUser.setType(loginUserInfo.getType());
+ if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
+ //濡傛灉鏄紒涓氳处鍙�
+ systemUser.setCompanyId(loginUserInfo.getCompanyId());
+ }
Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser);
return systemUserMapper.selectList(wrapper);
}
@@ -131,6 +146,12 @@
// List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>());
// List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList());
// pageWrap.getModel().setDepartmentIds(collect);
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ pageWrap.getModel().setType(loginUserInfo.getType());
+ if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
+ //濡傛灉鏄紒涓氳处鍙�
+ pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId());
}
// 鎵ц鏌ヨ
PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
@@ -202,7 +223,12 @@
@Override
public PageData<SystemUser> findAllList(PageWrap<SystemUser> pageWrap) {
-
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ pageWrap.getModel().setType(loginUserInfo.getType());
+ if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
+ //濡傛灉鏄紒涓氳处鍙�
+ pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId());
+ }
IPage<SystemUser> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
@@ -224,6 +250,12 @@
@Override
public List<SystemUser> findAllList(SystemUser pageWrap){
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ pageWrap.setType(loginUserInfo.getType());
+ if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
+ //濡傛灉鏄紒涓氳处鍙�
+ pageWrap.setCompanyId(loginUserInfo.getCompanyId());
+ }
MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(SystemUser.class);
--
Gitblit v1.9.3