From 0ebb006ea17307cbd9d681f45467f8f49715a5fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 16:52:01 +0800
Subject: [PATCH] 解决冲突
---
server/service/src/main/java/com/doumee/biz/system/SystemUserBiz.java | 17 +
server/company/src/main/java/com/doumee/CompanyApplication.java | 1
server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java | 4
server/service/src/main/java/com/doumee/dao/business/model/WebParam.java | 78 ++++++
server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java | 11
server/service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java | 8
server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java | 8
server/service/src/main/java/com/doumee/dao/system/dto/UpdateWebParamDTO.java | 34 ++
server/company/src/main/java/com/doumee/api/business/GoodsController.java | 3
server/company/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java | 15
server/company/src/main/java/com/doumee/api/system/SystemMenuController.java | 7
server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java | 69 +++++
server/company/src/main/java/com/doumee/api/business/WebParamController.java | 50 ++++
server/service/src/main/java/com/doumee/dao/system/dto/CreateCompanyUserDTO.java | 44 +++
server/service/src/main/java/com/doumee/service/system/SystemMenuService.java | 4
server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 102 ++++++++
server/service/src/main/resources/mappers/SystemRoleMapper.xml | 2
server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java | 4
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 109 +++++---
server/company/src/main/java/com/doumee/api/system/SystemUserController.java | 63 ++++
server/service/src/main/resources/mappers/SystemMenuMapper.xml | 3
server/service/src/main/java/com/doumee/service/business/WebParamService.java | 20 +
server/service/src/main/java/com/doumee/dao/business/WebParamMapper.java | 12 +
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 6
server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 2
server/platform/src/main/java/com/doumee/api/business/GoodsController.java | 3
26 files changed, 591 insertions(+), 88 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/CompanyApplication.java b/server/company/src/main/java/com/doumee/CompanyApplication.java
index 3e9fae0..b664755 100644
--- a/server/company/src/main/java/com/doumee/CompanyApplication.java
+++ b/server/company/src/main/java/com/doumee/CompanyApplication.java
@@ -4,6 +4,7 @@
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.context.ApplicationContext;
/**
diff --git a/server/company/src/main/java/com/doumee/api/business/GoodsController.java b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
index ec599bc..2db1ee9 100644
--- a/server/company/src/main/java/com/doumee/api/business/GoodsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
@@ -3,6 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Goods;
@@ -102,6 +103,8 @@
@PostMapping("/page")
@RequiresPermissions("business:goods:query")
public ApiResponse<PageData<Goods>> findPage (@RequestBody PageWrap<Goods> pageWrap) {
+ LoginUserInfo loginUserInfo = this.getLoginUser();
+ pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId());
return ApiResponse.success(goodsService.findPage(pageWrap));
}
diff --git a/server/company/src/main/java/com/doumee/api/business/WebParamController.java b/server/company/src/main/java/com/doumee/api/business/WebParamController.java
new file mode 100644
index 0000000..84a49b3
--- /dev/null
+++ b/server/company/src/main/java/com/doumee/api/business/WebParamController.java
@@ -0,0 +1,50 @@
+package com.doumee.api.business;
+
+import com.doumee.api.BaseController;
+import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.PageData;
+import com.doumee.dao.business.model.WebParam;
+import com.doumee.dao.system.dto.UpdateWebParamDTO;
+import com.doumee.service.business.WebParamService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @since 2023/09/12 11:18
+ */
+@Api(tags = "浼佷笟椤甸潰閰嶇疆淇℃伅琛�")
+@RestController
+@RequestMapping("/business/webParam")
+public class WebParamController extends BaseController {
+
+ @Autowired
+ private WebParamService webParamService;
+
+
+ @ApiOperation("鑾峰彇褰撳墠鐧诲綍浼佷笟閰嶇疆淇℃伅")
+ @GetMapping("/getByLogin")
+// @RequiresPermissions("business:webparam:query")
+ public ApiResponse<WebParam> getByLogin() {
+ return ApiResponse.success(webParamService.findOne());
+ }
+
+ @ApiOperation("鏇存柊浼佷笟閰嶇疆淇℃伅")
+ @PostMapping("/renew")
+// @RequiresPermissions("business:webparam:query")
+ public ApiResponse renew(@RequestBody UpdateWebParamDTO updateWebParamDTO) {
+ webParamService.renew(updateWebParamDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+}
diff --git a/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java
index 5e4cf01..3461a1b 100644
--- a/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -5,6 +5,7 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
import com.doumee.dao.system.model.SystemMenu;
import com.doumee.dao.system.vo.SystemMenuListVO;
@@ -42,14 +43,16 @@
@ApiOperation("鏌ヨ鑿滃崟鏍�")
@GetMapping("/treeNodes")
public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu () {
- return ApiResponse.success(systemMenuBiz.findTree(this.getLoginUser().getId()));
+ LoginUserInfo loginUserInfo = this.getLoginUser();
+ return ApiResponse.success(systemMenuBiz.findTree(loginUserInfo.getId(),loginUserInfo.getType()));
}
@ApiOperation("鏌ヨ鍒楄〃鏍�")
@PostMapping("/treeList")
@RequiresPermissions("system:menu:query")
public ApiResponse<List<SystemMenuListVO>> findTree () {
- return ApiResponse.success(systemMenuBiz.findTree());
+ LoginUserInfo loginUserInfo = this.getLoginUser();
+ return ApiResponse.success(systemMenuBiz.findTreeByType(loginUserInfo.getType()));
}
@PreventRepeat
diff --git a/server/company/src/main/java/com/doumee/api/system/SystemUserController.java b/server/company/src/main/java/com/doumee/api/system/SystemUserController.java
index 0d14fb7..f6169f7 100644
--- a/server/company/src/main/java/com/doumee/api/system/SystemUserController.java
+++ b/server/company/src/main/java/com/doumee/api/system/SystemUserController.java
@@ -7,10 +7,8 @@
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.dao.system.dto.CreateSystemUserDTO;
-import com.doumee.dao.system.dto.CreateUserRoleDTO;
-import com.doumee.dao.system.dto.QuerySystemUserDTO;
-import com.doumee.dao.system.dto.ResetSystemUserPwdDTO;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.system.dto.*;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.vo.SystemUserListVO;
import com.doumee.service.system.SystemUserService;
@@ -126,4 +124,61 @@
return ApiResponse.success(systemUserService.findById(id));
}
+
+ @Trace(withRequestParameters = false)
+ @PreventRepeat
+ @ApiOperation("鏂板缓鍛樺伐")
+ @PostMapping("/companyCreateUser")
+ @RequiresPermissions("system:user:create")
+ public ApiResponse companyCreate(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+ createCompanyUserDTO.setType(Constants.UserType.COMPANY.getKey());
+ systemUserBiz.companyCreateUser(createCompanyUserDTO);
+ return ApiResponse.success(null);
+ }
+
+ @Trace(withRequestParameters = false)
+ @PreventRepeat
+ @ApiOperation("鏂板缓涓绘挱")
+ @PostMapping("/companyCreateAnchor")
+// @RequiresPermissions("system:user:create")
+ public ApiResponse companyCreateAnchor(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+ createCompanyUserDTO.setType(Constants.UserType.ZHUBO.getKey());
+ systemUserBiz.companyCreateUser(createCompanyUserDTO);
+ return ApiResponse.success(null);
+ }
+
+
+ @Trace(withRequestParameters = false)
+ @PreventRepeat
+ @ApiOperation("淇敼鍛樺伐淇℃伅")
+ @PostMapping("/companyUpdUser")
+ @RequiresPermissions("system:user:create")
+ public ApiResponse companyUpdUser(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+ createCompanyUserDTO.setType(Constants.UserType.COMPANY.getKey());
+ systemUserBiz.companyCreateUser(createCompanyUserDTO);
+ return ApiResponse.success(null);
+ }
+
+ @Trace(withRequestParameters = false)
+ @PreventRepeat
+ @ApiOperation("淇敼涓绘挱淇℃伅")
+ @PostMapping("/companyUpdAnchor")
+ @RequiresPermissions("system:user:create")
+ public ApiResponse companyUpdAnchor(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+ createCompanyUserDTO.setType(Constants.UserType.ZHUBO.getKey());
+ systemUserBiz.companyUpdUser(createCompanyUserDTO);
+ return ApiResponse.success(null);
+ }
+
+
+ @Trace(withRequestParameters = false)
+ @PreventRepeat
+ @ApiOperation("淇敼瀵嗙爜")
+ @PostMapping("/updPassword")
+// @RequiresPermissions("system:user:create")
+ public ApiResponse updPassword(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+ systemUserBiz.updPassword(createCompanyUserDTO);
+ return ApiResponse.success(null);
+ }
+
}
diff --git a/server/company/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java b/server/company/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java
index 890ade0..8550e9d 100644
--- a/server/company/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java
+++ b/server/company/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java
@@ -5,6 +5,7 @@
import com.doumee.service.system.SystemUserService;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
@@ -23,7 +24,7 @@
@Override
public boolean doCredentialsMatch(AuthenticationToken token, AuthenticationInfo info) {
- ShiroToken usernamePasswordToken = (ShiroToken) token;
+ UsernamePasswordToken usernamePasswordToken = (UsernamePasswordToken) token;
SystemUser queryUserDto = new SystemUser();
queryUserDto.setUsername(usernamePasswordToken.getUsername());
queryUserDto.setDeleted(Boolean.FALSE);
@@ -31,12 +32,12 @@
if (systemUser == null) {
return Boolean.FALSE;
}
- if(usernamePasswordToken.getDdLogin()){
- return Boolean.TRUE;
- }
- if(usernamePasswordToken.getWxLogin()){
- return Boolean.TRUE;
- }
+// if(usernamePasswordToken.getDdLogin()){
+// return Boolean.TRUE;
+// }
+// if(usernamePasswordToken.getWxLogin()){
+// return Boolean.TRUE;
+// }
// 鍔犲瘑瀵嗙爜
String pwd = Utils.Secure.encryptPassword(new String(usernamePasswordToken.getPassword()), systemUser.getSalt());
// 姣旇緝瀵嗙爜
diff --git a/server/platform/src/main/java/com/doumee/api/business/GoodsController.java b/server/platform/src/main/java/com/doumee/api/business/GoodsController.java
index 2720321..dc3d1c7 100644
--- a/server/platform/src/main/java/com/doumee/api/business/GoodsController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/GoodsController.java
@@ -3,6 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Goods;
@@ -81,6 +82,8 @@
@PostMapping("/exportExcel")
@RequiresPermissions("business:goods:exportExcel")
public void exportExcel (@RequestBody PageWrap<Goods> pageWrap, HttpServletResponse response) {
+ LoginUserInfo loginUserInfo = this.getLoginUser();
+ pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId());
ExcelExporter.build(Goods.class).export(goodsService.findPage(pageWrap).getRecords(), "鍟嗗搧淇℃伅琛�", response);
}
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 7a36fc5..dd474e5 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
@@ -5,6 +5,7 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
import com.doumee.dao.system.model.SystemMenu;
import com.doumee.dao.system.vo.SystemMenuListVO;
@@ -42,14 +43,20 @@
@ApiOperation("鏌ヨ鑿滃崟鏍�")
@GetMapping("/treeNodes")
public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu () {
- return ApiResponse.success(systemMenuBiz.findTree(this.getLoginUser().getId()));
+ LoginUserInfo loginUserInfo = this.getLoginUser();
+ return ApiResponse.success(systemMenuBiz.findTree(loginUserInfo.getId(),loginUserInfo.getType()));
}
@ApiOperation("鏌ヨ鍒楄〃鏍�")
- @PostMapping("/treeList")
+ @PostMapping("/treeList/{type}")
@RequiresPermissions("system:menu:query")
+<<<<<<< HEAD
public ApiResponse<List<SystemMenuListVO>> findTree ( @RequestBody SystemMenu systemMenu ) {
return ApiResponse.success(systemMenuBiz.findTree());
+=======
+ public ApiResponse<List<SystemMenuListVO>> findTree (@PathVariable Integer type) {
+ return ApiResponse.success(systemMenuBiz.findTreeByType(type));
+>>>>>>> a7e6a3b52c64ba9add0ceb643d6915473a7770a4
}
@PreventRepeat
diff --git a/server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java b/server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java
index 8234f66..f47b9ac 100644
--- a/server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java
+++ b/server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java
@@ -40,14 +40,14 @@
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
*/
- List<SystemMenuNodeVO> findTree(Integer userId);
+ List<SystemMenuNodeVO> findTree(Integer userId,Integer type);
/**
* 鏌ヨ鑿滃崟鍒楄〃鏍�
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
*/
- List<SystemMenuListVO> findTree();
+ List<SystemMenuListVO> findTreeByType(Integer type);
/**
* 鍒犻櫎
diff --git a/server/service/src/main/java/com/doumee/biz/system/SystemUserBiz.java b/server/service/src/main/java/com/doumee/biz/system/SystemUserBiz.java
index 5a07d9e..1ddcbab 100644
--- a/server/service/src/main/java/com/doumee/biz/system/SystemUserBiz.java
+++ b/server/service/src/main/java/com/doumee/biz/system/SystemUserBiz.java
@@ -1,10 +1,6 @@
package com.doumee.biz.system;
-import com.doumee.dao.system.dto.CreateSystemUserDTO;
-import com.doumee.dao.system.dto.CreateUserRoleDTO;
-import com.doumee.dao.system.dto.ResetSystemUserPwdDTO;
-import com.doumee.dao.system.dto.UpdatePwdDto;
-import org.springframework.web.multipart.MultipartFile;
+import com.doumee.dao.system.dto.*;
import java.util.List;
@@ -64,4 +60,15 @@
*/
void createUserRole(CreateUserRoleDTO dto);
+ /**
+ * 浼佷笟鍒涘缓鐢ㄦ埛
+ * @param createCompanyUserDTO
+ */
+ void companyCreateUser(CreateCompanyUserDTO createCompanyUserDTO);
+
+ void companyUpdUser(CreateCompanyUserDTO updCreateCompanyUserDTO);
+
+ void updPassword(CreateCompanyUserDTO updCreateCompanyUserDTO);
+
+
}
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
index 7f17be8..0d96c2f 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
@@ -92,8 +92,8 @@
}
@Override
- public List<SystemMenuListVO> findTree() {
- List<SystemMenuListVO> menus = systemMenuService.findList();
+ public List<SystemMenuListVO> findTreeByType(Integer type) {
+ List<SystemMenuListVO> menus = systemMenuService.findList(type);
List<SystemMenuListVO> rootMenus = new ArrayList<>();
// 娣诲姞鏍硅彍鍗�
for (SystemMenu menu : menus) {
@@ -112,10 +112,10 @@
}
@Override
- public List<SystemMenuNodeVO> findTree (Integer userId) {
+ public List<SystemMenuNodeVO> findTree (Integer userId,Integer type) {
SystemMenu queryDto = new SystemMenu();
queryDto.setDeleted(Boolean.FALSE);
- List<SystemMenu> menus = systemMenuService.findByUserId(userId);
+ List<SystemMenu> menus = systemMenuService.findByUserId(userId,type);
List<SystemMenuNodeVO> rootNodes = new ArrayList<>();
// 娣诲姞鏍硅彍鍗�
for (SystemMenu menu : menus) {
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index 49c8cce..9b726f4 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -4,11 +4,10 @@
import com.doumee.biz.system.SystemUserBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.system.dto.CreateSystemUserDTO;
-import com.doumee.dao.system.dto.CreateUserRoleDTO;
-import com.doumee.dao.system.dto.ResetSystemUserPwdDTO;
-import com.doumee.dao.system.dto.UpdatePwdDto;
+import com.doumee.dao.system.dto.*;
import com.doumee.dao.system.model.SystemDepartment;
import com.doumee.dao.system.model.SystemDepartmentUser;
import com.doumee.dao.system.model.SystemUser;
@@ -16,6 +15,8 @@
import com.doumee.service.system.*;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +25,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
@Service
public class SystemUserBizImpl implements SystemUserBiz {
@@ -228,6 +230,98 @@
}
}
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void companyCreateUser(CreateCompanyUserDTO createCompanyUserDTO) {
+ if(Objects.isNull(createCompanyUserDTO)
+ ||StringUtils.isBlank(createCompanyUserDTO.getUserName())
+ ||StringUtils.isBlank(createCompanyUserDTO.getRealName())
+ ||StringUtils.isBlank(createCompanyUserDTO.getPassword())
+ ||StringUtils.isBlank(createCompanyUserDTO.getMobile())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ SystemUser queryUserDto = new SystemUser();
+ queryUserDto.setUsername(createCompanyUserDTO.getUserName());
+ queryUserDto.setDeleted(Boolean.FALSE);
+ SystemUser user = systemUserService.findOne(queryUserDto);
+ if (user != null) {
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐢ㄦ埛鍚嶅凡瀛樺湪");
+ }
+ SystemUser systemUser = new SystemUser();
+ BeanUtils.copyProperties(createCompanyUserDTO,systemUser);
+ systemUser.setCompanyId(loginUserInfo.getCompanyId());
+ systemUser.setRealname(createCompanyUserDTO.getRealName());
+ systemUser.setUsername(createCompanyUserDTO.getUserName());
+ // 鐢熸垚瀵嗙爜鐩�
+ String salt = RandomStringUtils.randomAlphabetic(6);
+ // 鐢熸垚瀵嗙爜
+ systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getPassword(), salt));
+ systemUser.setSalt(salt);
+ Integer userId = systemUserService.create(systemUser);
+ if(systemUser.getType().equals(Constants.UserType.COMPANY)){
+ SystemUserRole newUserRole = new SystemUserRole();
+ newUserRole.setUserId(userId);
+ newUserRole.setRoleId(createCompanyUserDTO.getRoleId());
+ systemUserRoleService.create(newUserRole);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void companyUpdUser(CreateCompanyUserDTO updCreateCompanyUserDTO) {
+ if(Objects.isNull(updCreateCompanyUserDTO)
+ ||Objects.isNull(updCreateCompanyUserDTO.getUserId())
+ ||StringUtils.isBlank(updCreateCompanyUserDTO.getRealName())
+ ||StringUtils.isBlank(updCreateCompanyUserDTO.getMobile())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ SystemUser systemUser = systemUserService.findById(updCreateCompanyUserDTO.getUserId());
+ if(Objects.isNull(systemUser)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ systemUser.setRealname(updCreateCompanyUserDTO.getRealName());
+ systemUser.setMobile(systemUser.getMobile());
+
+ // 鐢熸垚瀵嗙爜鐩�
+// String salt = RandomStringUtils.randomAlphabetic(6);
+// // 鐢熸垚瀵嗙爜
+// systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getPassword(), salt));
+// systemUser.setSalt(salt);
+ systemUserService.updateById(systemUser);
+ if(systemUser.getType().equals(Constants.UserType.COMPANY)){
+ // 鍒犻櫎鍏宠仈瑙掕壊
+ SystemUserRole deleteDto = new SystemUserRole();
+ deleteDto.setUserId(systemUser.getId());
+ systemUserRoleService.delete(deleteDto);
+ SystemUserRole newUserRole = new SystemUserRole();
+ newUserRole.setUserId(systemUser.getId());
+ newUserRole.setRoleId(updCreateCompanyUserDTO.getRoleId());
+ systemUserRoleService.create(newUserRole);
+ }
+ }
+
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void updPassword(CreateCompanyUserDTO updCreateCompanyUserDTO) {
+ if(Objects.isNull(updCreateCompanyUserDTO)
+ ||Objects.isNull(updCreateCompanyUserDTO.getUserId())
+ ||StringUtils.isBlank(updCreateCompanyUserDTO.getPassword())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ SystemUser systemUser = systemUserService.findById(updCreateCompanyUserDTO.getUserId());
+ if(Objects.isNull(systemUser)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ // 鐢熸垚瀵嗙爜鐩�
+ String salt = RandomStringUtils.randomAlphabetic(6);
+ // 鐢熸垚瀵嗙爜
+ systemUser.setPassword(Utils.Secure.encryptPassword(updCreateCompanyUserDTO.getPassword(), salt));
+ systemUser.setSalt(salt);
+ systemUserService.updateById(systemUser);
+ }
+
private <K,V> K getKey(Map<K,V> map,V v){
diff --git a/server/service/src/main/java/com/doumee/dao/business/WebParamMapper.java b/server/service/src/main/java/com/doumee/dao/business/WebParamMapper.java
new file mode 100644
index 0000000..516de7f
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/WebParamMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.WebParam;
+
+/**
+ * @author 姹熻箘韫�
+ * @since 2023/09/12 11:18
+ */
+public interface WebParamMapper extends BaseMapper<WebParam> {
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/WebParam.java b/server/service/src/main/java/com/doumee/dao/business/model/WebParam.java
new file mode 100644
index 0000000..220b9d6
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/model/WebParam.java
@@ -0,0 +1,78 @@
+package com.doumee.dao.business.model;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+
+/**
+ * 浼佷笟椤甸潰閰嶇疆淇℃伅琛�
+ * @author 姹熻箘韫�
+ * @since 2023/09/12 11:18
+ */
+@Data
+@ApiModel("浼佷笟椤甸潰閰嶇疆淇℃伅琛�")
+@TableName("`web_param`")
+public class WebParam {
+
+ @TableId(type = IdType.AUTO)
+ @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ExcelColumn(name="涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
+ @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+ private Byte deleted;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ private Integer createUser;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ private Integer updateUser;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany琛�)", example = "1")
+ @ExcelColumn(name="浼佷笟缂栫爜锛堝叧鑱攃ompany琛�)")
+ private Integer companyId;
+
+ @ApiModelProperty(value = "涓昏壊鍊�")
+ @ExcelColumn(name="涓昏壊鍊�")
+ private String mainColor;
+
+ @ApiModelProperty(value = "鑳屾櫙鍥�")
+ @ExcelColumn(name="鑳屾櫙鍥�")
+ private String bgImg;
+
+ @ApiModelProperty(value = "椤堕儴瀹ｄ紶鍥�")
+ @ExcelColumn(name="椤堕儴瀹ｄ紶鍥�")
+ private String topImg;
+
+ @ApiModelProperty(value = "PK鍙板浘")
+ @ExcelColumn(name="PK鍙板浘")
+ private String pkImg;
+
+ @ApiModelProperty(value = "鍐呭鑼冨洿灏哄")
+ @ExcelColumn(name="鍐呭鑼冨洿灏哄")
+ private String rangeSize;
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java b/server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java
index 02b695d..f5ba1b9 100644
--- a/server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java
@@ -13,14 +13,14 @@
* @author Eva.Caesar Liu
* @date 2023/02/14 11:14
*/
- List<SystemMenuListVO> selectManageList();
+ List<SystemMenuListVO> selectManageList(Integer type);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ
* @author Eva.Caesar Liu
* @date 2023/02/14 11:14
*/
- List<SystemMenu> selectByUserId(Integer userId);
+ List<SystemMenu> selectByUserId(Integer userId,Integer type);
/**
* 鏍规嵁瑙掕壊ID鏌ヨ
diff --git a/server/service/src/main/java/com/doumee/dao/system/dto/CreateCompanyUserDTO.java b/server/service/src/main/java/com/doumee/dao/system/dto/CreateCompanyUserDTO.java
new file mode 100644
index 0000000..cb92ac7
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/system/dto/CreateCompanyUserDTO.java
@@ -0,0 +1,44 @@
+package com.doumee.dao.system.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/9/12 9:31
+ */
+@Data
+@ApiModel("鍒涘缓鐢ㄦ埛鍙傛暟")
+public class CreateCompanyUserDTO {
+
+
+ @ApiModelProperty(value = "鐢ㄦ埛涓婚敭", example = "1")
+ private Integer userId;
+
+ @ApiModelProperty(value = "璐﹀彿", example = "1")
+ private String userName;
+
+ @ApiModelProperty(value = "鐪熷疄濮撳悕", example = "1")
+ private String realName;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�", example = "1")
+ private String mobile;
+
+ @ApiModelProperty(value = "瀵嗙爜", example = "1")
+ private String password;
+
+ @ApiModelProperty(value = "瑙掕壊涓婚敭锛堜紒涓氱敤鎴蜂娇鐢級", example = "1")
+ private Integer roleId;
+
+ @ApiModelProperty(value = "绫诲瀷 1浼佷笟鐢ㄦ埛 2涓绘挱", hidden = true)
+ private Integer type;
+
+ @ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany琛�)", hidden = true)
+ private Integer companyId;
+
+
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/system/dto/UpdateWebParamDTO.java b/server/service/src/main/java/com/doumee/dao/system/dto/UpdateWebParamDTO.java
new file mode 100644
index 0000000..421e16c
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/system/dto/UpdateWebParamDTO.java
@@ -0,0 +1,34 @@
+package com.doumee.dao.system.dto;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/9/12 9:31
+ */
+@Data
+@ApiModel("鏇存柊浼佷笟閰嶇疆璇锋眰绫�")
+public class UpdateWebParamDTO {
+
+ @ApiModelProperty(value = "鍐呭鑼冨洿灏哄")
+ private String rangeSize;
+
+ @ApiModelProperty(value = "涓昏壊鍊�")
+ private String mainColor;
+
+ @ApiModelProperty(value = "鑳屾櫙鍥�")
+ private String bgImg;
+
+ @ApiModelProperty(value = "椤堕儴瀹ｄ紶鍥�")
+ private String topImg;
+
+ @ApiModelProperty(value = "PK鍙板浘")
+ private String pkImg;
+
+
+}
diff --git a/server/service/src/main/java/com/doumee/service/business/WebParamService.java b/server/service/src/main/java/com/doumee/service/business/WebParamService.java
new file mode 100644
index 0000000..823bcfe
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/service/business/WebParamService.java
@@ -0,0 +1,20 @@
+package com.doumee.service.business;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.WebParam;
+import com.doumee.dao.system.dto.UpdateWebParamDTO;
+
+import java.util.List;
+
+/**
+ * 浼佷笟椤甸潰閰嶇疆淇℃伅琛⊿ervice瀹氫箟
+ * @author 姹熻箘韫�
+ * @since 2023/09/12 11:18
+ */
+public interface WebParamService {
+
+ WebParam findOne();
+
+ void renew(UpdateWebParamDTO updateWebParamDTO);
+}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
index 83aa2a7..d4b4034 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
@@ -140,6 +140,9 @@
// 绫诲瀷 0浼佷笟 1骞冲彴
if (Objects.isNull(user.getCompanyId())) {
wrapper.lambda().eq(Brand::getType,Constants.ONE);
+ }else {
+ wrapper.lambda().eq(Brand::getType,brand.getCompanyId())
+ .or().eq(Brand::getType,Constants.ZERO);
}
List<Brand> list = brandMapper.selectList(wrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
@@ -166,6 +169,9 @@
// 绫诲瀷 0浼佷笟 1骞冲彴
if (Objects.isNull(user.getCompanyId())) {
queryWrapper.lambda().eq(Brand::getType,Constants.ONE);
+ }else {
+ queryWrapper.lambda().eq(Brand::getType,pageWrap.getModel().getCompanyId())
+ .or().eq(Brand::getType,Constants.ZERO);
}
queryWrapper.lambda().orderByAsc(Brand::getSortnum);
IPage<Brand> brandIPage = brandMapper.selectPage(page, queryWrapper);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index 1b54d9a..4e04375 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -644,9 +644,10 @@
if (pageWrap.getModel().getBrandId() != null) {
queryWrapper.eq(Goods::getBrandId, pageWrap.getModel().getBrandId());
}
-
+ if (pageWrap.getModel().getCompanyId() != null) {
+ queryWrapper.eq(Goods::getCompanyId, pageWrap.getModel().getCompanyId());
+ }
queryWrapper.orderByDesc(Goods::getId);
-
IPage<Goods> goodsIPage = goodsJoinMapper.selectJoinPage(page, Goods.class, queryWrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
+ systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
@@ -761,54 +762,54 @@
//鏌ヨ鍏ㄩ儴灞炴��1鍜屽睘鎬�2瑙勬牸鍊�
List<CateAttr> allAttr = cateAttrMapper.selectList(new QueryWrapper<>(ca));
//灞炴��1闆嗗悎
- String[] attrs = StringUtils.defaultString(m.getAttrFirstNames(),"").split("\n");
+// String[] attrs = StringUtils.defaultString(m.getAttrFirstNames(),"").split("\n");
//灞炴��2闆嗗悎
- String[] attrs2 = StringUtils.defaultString(m.getAttrSecodNames(),"").split("\n");
+// String[] attrs2 = StringUtils.defaultString(m.getAttrSecodNames(),"").split("\n");
//浜у搧鍙傛暟闆嗗悎
String[] params = StringUtils.defaultString(m.getParamStr(),"").split("\n");
- if(attrs.length > 0){
- String attrids="" ,attrNames="";
- for(String s : attrs){
- if(StringUtils.isBlank(s)){
- continue;
- }
- //鏌ヨ灞炴�ц鏍煎璞�
- CateAttr ta = getCateAttrByName(s,Constants.ZERO,allAttr);
- if(ta == null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣灞炴��1涓��"+s+"銆戞棤鏁堬紝璇锋鏌ヨ緭鍏ワ紒");
- }
- if(StringUtils.isNotBlank(attrids)){
- attrids += ",";
- attrNames += ",";
- }
- attrids+= ta.getId();
- attrNames+= ta.getName();
- }
- newModel.setAttrFirstIds(attrids);
- newModel.setAttrFirstNames(attrNames);
- }
- if(attrs2.length > 0){
- String attrids="" ,attrNames="";
- for(String s : attrs2){
- if(StringUtils.isBlank(s)){
- continue;
- }
- //鏌ヨ灞炴�ц鏍煎璞�
- CateAttr ta = getCateAttrByName(s,Constants.ONE,allAttr);
- if(ta == null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣灞炴��1涓��"+s+"銆戞棤鏁堬紝璇锋鏌ヨ緭鍏ワ紒");
- }
- if(StringUtils.isNotBlank(attrids)){
- attrids += ",";
- attrNames += ",";
- }
- attrids+= ta.getId();
- attrNames+= ta.getName();
- }
- newModel.setAttrSecodIds(attrids);
- newModel.setAttrSecodNames(attrNames);
-
- }
+// if(attrs.length > 0){
+// String attrids="" ,attrNames="";
+// for(String s : attrs){
+// if(StringUtils.isBlank(s)){
+// continue;
+// }
+// //鏌ヨ灞炴�ц鏍煎璞�
+// CateAttr ta = getCateAttrByName(s,Constants.ZERO,allAttr);
+// if(ta == null){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣灞炴��1涓��"+s+"銆戞棤鏁堬紝璇锋鏌ヨ緭鍏ワ紒");
+// }
+// if(StringUtils.isNotBlank(attrids)){
+// attrids += ",";
+// attrNames += ",";
+// }
+// attrids+= ta.getId();
+// attrNames+= ta.getName();
+// }
+// newModel.setAttrFirstIds(attrids);
+// newModel.setAttrFirstNames(attrNames);
+// }
+// if(attrs2.length > 0){
+// String attrids="" ,attrNames="";
+// for(String s : attrs2){
+// if(StringUtils.isBlank(s)){
+// continue;
+// }
+// //鏌ヨ灞炴�ц鏍煎璞�
+// CateAttr ta = getCateAttrByName(s,Constants.ONE,allAttr);
+// if(ta == null){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣灞炴��1涓��"+s+"銆戞棤鏁堬紝璇锋鏌ヨ緭鍏ワ紒");
+// }
+// if(StringUtils.isNotBlank(attrids)){
+// attrids += ",";
+// attrNames += ",";
+// }
+// attrids+= ta.getId();
+// attrNames+= ta.getName();
+// }
+// newModel.setAttrSecodIds(attrids);
+// newModel.setAttrSecodNames(attrNames);
+//
+// }
List<String> mulFiles = null;
String proDir =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode();
@@ -890,6 +891,20 @@
gp.setSortnum(ta.getSortnum());
//鎻掑叆浜у搧鍙傛暟鍏宠仈琛�
goodsParamMapper.insert(gp);
+ //瀛樺偍 cate_param_select 鏌ヨ鏄惁宸插瓨鍦�
+ if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
+ .eq("PARAM_ID",gp.getPramaId()).eq("NAME",gp.getName()))<=Constants.ZERO){
+ CateParamSelect cateParamSelect = new CateParamSelect();
+ cateParamSelect.setCreator(user.getId());
+ cateParamSelect.setCreateDate(new Date());
+ cateParamSelect.setName(gp.getVal());
+ cateParamSelect.setIsdeleted(Constants.ZERO);
+ cateParamSelect.setStatus(Constants.ZERO);
+ cateParamSelect.setParamId(gp.getPramaId());
+ cateParamSelect.setCategoryId(newModel.getCategoryId());
+ cateParamSelect.setStatus(Constants.ZERO);
+ cateParamSelectMapper.insert(cateParamSelect);
+ };
}
}
if(mulFiles !=null && mulFiles.size()>0){
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java
new file mode 100644
index 0000000..e3f920e
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java
@@ -0,0 +1,69 @@
+package com.doumee.service.business.impl;
+
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.WebParamMapper;
+import com.doumee.dao.business.model.WebParam;
+import com.doumee.dao.system.dto.UpdateWebParamDTO;
+import com.doumee.service.business.WebParamService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 浼佷笟椤甸潰閰嶇疆淇℃伅琛⊿ervice瀹炵幇
+ * @author 姹熻箘韫�
+ * @since 2023/09/12 11:18
+ */
+@Service
+public class WebParamServiceImpl implements WebParamService {
+
+ @Autowired
+ private WebParamMapper webParamMapper;
+
+ @Override
+ public WebParam findOne() {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ QueryWrapper<WebParam> wrapper = new QueryWrapper<>();
+ wrapper.eq("COMPANY_ID",user.getCompanyId());
+ wrapper.last(" limit 1 ");
+ return webParamMapper.selectOne(wrapper);
+ }
+
+
+ @Override
+ public void renew(UpdateWebParamDTO updateWebParamDTO) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ QueryWrapper<WebParam> wrapper = new QueryWrapper<>();
+ wrapper.eq("COMPANY_ID",user.getCompanyId());
+ wrapper.last(" limit 1 ");
+ WebParam webParam = webParamMapper.selectOne(wrapper);
+ if(Objects.isNull(webParam)){
+ webParam = new WebParam();
+ BeanUtils.copyProperties(updateWebParamDTO,webParam);
+ webParam.setCreateTime(new Date());
+ webParam.setCompanyId(user.getCompanyId());
+ webParam.setCreateUser(user.getId());
+ webParamMapper.insert(webParam);
+ }else{
+ BeanUtils.copyProperties(updateWebParamDTO,webParam);
+ webParam.setUpdateUser(user.getId());
+ webParam.setUpdateTime(new Date());
+ webParamMapper.updateById(webParam);
+ }
+ }
+
+
+}
diff --git a/server/service/src/main/java/com/doumee/service/system/SystemMenuService.java b/server/service/src/main/java/com/doumee/service/system/SystemMenuService.java
index 108a492..8ed5e30 100644
--- a/server/service/src/main/java/com/doumee/service/system/SystemMenuService.java
+++ b/server/service/src/main/java/com/doumee/service/system/SystemMenuService.java
@@ -73,7 +73,7 @@
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
*/
- List<SystemMenuListVO> findList();
+ List<SystemMenuListVO> findList(Integer type);
/**
* 鏌ヨ涓�绾ц彍鍗曞垪琛�
@@ -87,7 +87,7 @@
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
*/
- List<SystemMenu> findByUserId(Integer userId);
+ List<SystemMenu> findByUserId(Integer userId,Integer type);
/**
* 鏍规嵁瑙掕壊ID鏌ヨ
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java
index 716d684..8ae48dc 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java
@@ -83,8 +83,8 @@
}
@Override
- public List<SystemMenuListVO> findList() {
- return systemMenuMapper.selectManageList();
+ public List<SystemMenuListVO> findList(Integer type) {
+ return systemMenuMapper.selectManageList(type);
}
@Override
@@ -98,8 +98,8 @@
}
@Override
- public List<SystemMenu> findByUserId(Integer userId) {
- return systemMenuMapper.selectByUserId(userId);
+ public List<SystemMenu> findByUserId(Integer userId,Integer type) {
+ return systemMenuMapper.selectByUserId(userId,type);
}
@Override
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 fd6827f..7a8c126 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
@@ -121,7 +121,7 @@
Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser);
return systemUserMapper.selectList(wrapper);
}
-
+
@Override
public PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap) {
// 鏍归儴闂ㄦ潯浠跺鐞嗭紙闇�鏌ヨ鏍归儴闂ㄤ笅鎵�鏈夐儴闂ㄧ殑鐢ㄦ埛锛�
diff --git a/server/service/src/main/resources/mappers/SystemMenuMapper.xml b/server/service/src/main/resources/mappers/SystemMenuMapper.xml
index 39df661..104ed0c 100644
--- a/server/service/src/main/resources/mappers/SystemMenuMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemMenuMapper.xml
@@ -23,7 +23,7 @@
JOIN `SYSTEM_USER` create_user ON create_user.ID = menu.CREATE_USER
LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = menu.UPDATE_USER
<where>
- menu.DELETED = 0
+ menu.DELETED = 0 and menu.type = #{type}
</where>
ORDER BY menu.SORT
</select>
@@ -39,6 +39,7 @@
AND menu.DELETED = 0
AND menu.DISABLED = 0
AND user_role.USER_ID = #{userId}
+ AND menu.TYPE = #{type}
</where>
ORDER BY menu.SORT
</select>
diff --git a/server/service/src/main/resources/mappers/SystemRoleMapper.xml b/server/service/src/main/resources/mappers/SystemRoleMapper.xml
index e2851b9..ea4849f 100644
--- a/server/service/src/main/resources/mappers/SystemRoleMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemRoleMapper.xml
@@ -16,7 +16,7 @@
</resultMap>
<select id="selectManageList" parameterType="com.doumee.dao.system.dto.QuerySystemUserDTO" resultMap="SystemRoleListVO">
SELECT
- role.ID, role.`CODE`, role.`NAME`, role.`REMARK`, role.`FIXED`, role.`CREATE_TIME`, role.`UPDATE_TIME`,
+ role.ID, role.`CODE`, role.`NAME`, role.`REMARK`, role.`FIXED`, role.`CREATE_TIME`, role.`UPDATE_TIME`,role.type,
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
FROM SYSTEM_ROLE role
--
Gitblit v1.9.3