From 45bfb77d4b4d1b1d3204475caba9b9c0e3e04ef9 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 16:58:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 349 ++++++++++---------------------
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 7
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java | 4
consum-base/src/main/java/com/consum/base/cache/RedisFinSysTenantUserCache.java | 21 +
consum-base/src/main/java/com/consum/base/config/RedisFinCacheConfig.java | 14
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 5
consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java | 4
consum-base/src/main/java/com/consum/base/config/LocalFinCacheConfig.java | 17
consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java | 3
consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java | 69 ++---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 3
consum-base/src/main/java/com/consum/base/cache/LocalFinSysTenantUserCache.java | 17
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 44 ++-
consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java | 43 +++
consum-base/src/main/java/com/consum/base/BaseController.java | 8
15 files changed, 275 insertions(+), 333 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/BaseController.java b/consum-base/src/main/java/com/consum/base/BaseController.java
index bdf12d3..468f48c 100644
--- a/consum-base/src/main/java/com/consum/base/BaseController.java
+++ b/consum-base/src/main/java/com/consum/base/BaseController.java
@@ -3,7 +3,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import java.net.URLEncoder;
import javax.servlet.http.HttpServletResponse;
@@ -50,19 +49,14 @@
}
protected String downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) throws Exception {
- response.setCharacterEncoding("UTF-8");
- response.setHeader("content-Type", "application/vnd.ms-excel");
- response.setHeader("Content-Disposition",
- "attachment;filename=" + URLEncoder.encode(fileName + ".xls", "UTF-8"));
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
workbook.write(byteArrayOutputStream);
- response.setHeader("Content-Length", String.valueOf(byteArrayOutputStream.size()));
InputStream byteArrayInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
FileInfo fileInfo = this.uploadFileToLocal(byteArrayInputStream, fileName + ".xls", "-1",
byteArrayOutputStream.size(), 0, "-1");
String fileUrl = fileInfo.getUrl();
- workbook.close();
+
return "/file/" + fileUrl;
}
diff --git a/consum-base/src/main/java/com/consum/base/cache/LocalFinSysTenantUserCache.java b/consum-base/src/main/java/com/consum/base/cache/LocalFinSysTenantUserCache.java
index f605002..9caf015 100644
--- a/consum-base/src/main/java/com/consum/base/cache/LocalFinSysTenantUserCache.java
+++ b/consum-base/src/main/java/com/consum/base/cache/LocalFinSysTenantUserCache.java
@@ -1,16 +1,17 @@
package com.consum.base.cache;
+import java.util.List;
+
import com.consum.base.Constants;
import com.consum.base.FinSysTenantUserCacheProvider;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.base.service.FinSysTenantUserService;
import com.consum.model.po.FinSysTenantUser;
import com.walker.cache.AbstractCacheProvider;
import com.walker.cache.Cache;
import com.walker.infrastructure.utils.StringUtils;
-import java.util.List;
-
-public class LocalFinSysTenantUserCache extends AbstractCacheProvider<FinSysTenantUser> implements FinSysTenantUserCacheProvider {
+public class LocalFinSysTenantUserCache extends AbstractCacheProvider<FinSysTenantUser>
+ implements FinSysTenantUserCacheProvider {
@Override
public FinSysTenantUser get(String userId) {
@@ -40,8 +41,8 @@
@Override
protected int loadDataToCache(Cache cache) {
List<FinSysTenantUser> hosts = this.finSysTenantUserService.selectAll(new FinSysTenantUser());
- if(!StringUtils.isEmptyList(hosts)){
- for(FinSysTenantUser h : hosts){
+ if (!StringUtils.isEmptyList(hosts)) {
+ for (FinSysTenantUser h : hosts) {
cache.put(String.valueOf(h.getSysUserId()), h);
}
return hosts.size();
@@ -59,9 +60,9 @@
return FinSysTenantUser.class;
}
- public void setFinSysTenantUserService(FinSysTenantUserServiceImpl finSysTenantUserService) {
+ public void setFinSysTenantUserService(FinSysTenantUserService finSysTenantUserService) {
this.finSysTenantUserService = finSysTenantUserService;
}
- private FinSysTenantUserServiceImpl finSysTenantUserService;
+ private FinSysTenantUserService finSysTenantUserService;
}
diff --git a/consum-base/src/main/java/com/consum/base/cache/RedisFinSysTenantUserCache.java b/consum-base/src/main/java/com/consum/base/cache/RedisFinSysTenantUserCache.java
index 3ad382f..0ae906c 100644
--- a/consum-base/src/main/java/com/consum/base/cache/RedisFinSysTenantUserCache.java
+++ b/consum-base/src/main/java/com/consum/base/cache/RedisFinSysTenantUserCache.java
@@ -1,20 +1,21 @@
package com.consum.base.cache;
-
import com.consum.base.Constants;
import com.consum.base.FinSysTenantUserCacheProvider;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.base.service.FinSysTenantUserService;
import com.consum.model.po.FinSysTenantUser;
import com.walker.support.redis.cache.RedisCacheProvider;
/**
* Redis瀹炵幇鐨勫悗鍙扮櫥褰曠敤鎴�
+ *
* @author 鐜嬫兜
* @date 2023-07-18
*/
-public class RedisFinSysTenantUserCache extends RedisCacheProvider<FinSysTenantUser> implements FinSysTenantUserCacheProvider {
+public class RedisFinSysTenantUserCache extends RedisCacheProvider<FinSysTenantUser>
+ implements FinSysTenantUserCacheProvider {
- public RedisFinSysTenantUserCache(){
+ public RedisFinSysTenantUserCache() {
this.setUseRedis(true);
this.setLoadPage(false);
}
@@ -22,9 +23,9 @@
@Override
public FinSysTenantUser get(String userId) {
FinSysTenantUser finSysTenantUser = this.getCacheData(userId);
- if(finSysTenantUser == null){
+ if (finSysTenantUser == null) {
finSysTenantUser = this.finSysTenantUserService.queryOneByUserId(userId);
- if(finSysTenantUser == null){
+ if (finSysTenantUser == null) {
logger.warn("浠庢暟鎹簱鏈煡璇㈠埌鐢ㄦ埛锛屾棤娉曠紦瀛橈紝userId = {}", userId);
return null;
}
@@ -53,9 +54,9 @@
@Override
public FinSysTenantUser getByUserId(String userId) {
FinSysTenantUser finSysTenantUser = this.getCacheData(userId);
- if(finSysTenantUser == null){
+ if (finSysTenantUser == null) {
finSysTenantUser = this.finSysTenantUserService.queryOneById(userId);
- if(finSysTenantUser == null){
+ if (finSysTenantUser == null) {
logger.warn("浠庢暟鎹簱鏈煡璇㈠埌鐢ㄦ埛锛屾棤娉曠紦瀛橈紝userId = {}", userId);
return null;
}
@@ -74,9 +75,9 @@
return FinSysTenantUser.class;
}
- public void setFinSysTenantUserService(FinSysTenantUserServiceImpl finSysTenantUserService) {
+ public void setFinSysTenantUserService(FinSysTenantUserService finSysTenantUserService) {
this.finSysTenantUserService = finSysTenantUserService;
}
- private FinSysTenantUserServiceImpl finSysTenantUserService;
+ private FinSysTenantUserService finSysTenantUserService;
}
diff --git a/consum-base/src/main/java/com/consum/base/config/LocalFinCacheConfig.java b/consum-base/src/main/java/com/consum/base/config/LocalFinCacheConfig.java
index 90a046f..5834154 100644
--- a/consum-base/src/main/java/com/consum/base/config/LocalFinCacheConfig.java
+++ b/consum-base/src/main/java/com/consum/base/config/LocalFinCacheConfig.java
@@ -14,7 +14,7 @@
import com.consum.base.cache.LocalTokenCache;
import com.consum.base.service.FinOrgService;
import com.consum.base.service.FinSysTenantService;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.base.service.FinSysTenantUserService;
import com.iplatform.base.config.CacheConfiguration;
@Configuration
@@ -23,12 +23,13 @@
/**
* 閰嶇疆涓氬姟鏈烘瀯缂撳瓨銆�
+ *
* @param finOrgService
* @return
* @date 2023-07-05
*/
@Bean
- public FinOrgCacheProvider finOrgCacheProvider(FinOrgService finOrgService){
+ public FinOrgCacheProvider finOrgCacheProvider(FinOrgService finOrgService) {
LocalFinOrgCache cache = new LocalFinOrgCache();
cache.setFinOrgService(finOrgService);
return cache;
@@ -40,31 +41,33 @@
* @Date 2023/7/18 13:36
*/
@Bean
- public FinSysTenantUserCacheProvider finSysTenantUserCacheProvider(FinSysTenantUserServiceImpl finSysTenantUserService){
+ public FinSysTenantUserCacheProvider
+ finSysTenantUserCacheProvider(FinSysTenantUserService finSysTenantUserService) {
LocalFinSysTenantUserCache cache = new LocalFinSysTenantUserCache();
cache.setFinSysTenantUserService(finSysTenantUserService);
return cache;
}
-
/**
- * 姹熷崡鐧诲綍鐢ㄦ埛缂撳瓨
+ * 姹熷崡鐧诲綍鐢ㄦ埛缂撳瓨
+ *
* @return
*/
@Bean
- public TokenCacheProvider tokenCacheProvider(){
+ public TokenCacheProvider tokenCacheProvider() {
LocalTokenCache cache = new LocalTokenCache();
return cache;
}
/**
* 閰嶇疆涓氬姟鏈烘瀯缂撳瓨銆�
+ *
* @param finSysTenantService
* @return
* @date 2023-07-05
*/
@Bean
- public FinSysTenantCacheProvider finSysTenantCacheProvider(FinSysTenantService finSysTenantService){
+ public FinSysTenantCacheProvider finSysTenantCacheProvider(FinSysTenantService finSysTenantService) {
LocalFinSysTenantCache cache = new LocalFinSysTenantCache();
cache.setFinSysTenantService(finSysTenantService);
return cache;
diff --git a/consum-base/src/main/java/com/consum/base/config/RedisFinCacheConfig.java b/consum-base/src/main/java/com/consum/base/config/RedisFinCacheConfig.java
index da5547a..2bff3dc 100644
--- a/consum-base/src/main/java/com/consum/base/config/RedisFinCacheConfig.java
+++ b/consum-base/src/main/java/com/consum/base/config/RedisFinCacheConfig.java
@@ -17,7 +17,7 @@
import com.consum.base.cache.RedisTokenCache;
import com.consum.base.service.FinOrgService;
import com.consum.base.service.FinSysTenantService;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.base.service.FinSysTenantUserService;
import com.iplatform.base.config.CacheConfiguration;
import com.walker.support.redis.RedisHelper;
import com.walker.support.redis.cache.RedisCacheProvider;
@@ -30,13 +30,14 @@
/**
* Redis瀹炵幇鐨勪笟鍔℃満鏋勭紦瀛橀厤缃��
+ *
* @param redisHelper
* @param finOrgService
* @return
* @date 2023-07-05
*/
@Bean
- public FinOrgCacheProvider finOrgCacheProvider(RedisHelper redisHelper, FinOrgService finOrgService){
+ public FinOrgCacheProvider finOrgCacheProvider(RedisHelper redisHelper, FinOrgService finOrgService) {
RedisFinOrgCache cache = new RedisFinOrgCache();
cache.setRedisHelper(redisHelper);
cache.setFinOrgService(finOrgService);
@@ -49,7 +50,8 @@
* @Date 2023/7/18 13:38
*/
@Bean
- public FinSysTenantUserCacheProvider finSysTenantUserCacheProvider(RedisHelper redisHelper, FinSysTenantUserServiceImpl finSysTenantUserService){
+ public FinSysTenantUserCacheProvider finSysTenantUserCacheProvider(RedisHelper redisHelper,
+ FinSysTenantUserService finSysTenantUserService) {
RedisFinSysTenantUserCache cache = new RedisFinSysTenantUserCache();
cache.setRedisHelper(redisHelper);
cache.setFinSysTenantUserService(finSysTenantUserService);
@@ -62,7 +64,7 @@
* @Date 2023/7/18 13:38
*/
@Bean
- public TokenCacheProvider tokenCacheProvider(RedisHelper redisHelper){
+ public TokenCacheProvider tokenCacheProvider(RedisHelper redisHelper) {
RedisTokenCache cache = new RedisTokenCache();
cache.setRedisHelper(redisHelper);
return cache;
@@ -70,13 +72,15 @@
/**
* Redis瀹炵幇鐨勪笟鍔℃満鏋勭紦瀛橀厤缃��
+ *
* @param redisHelper
* @param finSysTenantService
* @return
* @date 2023-07-05
*/
@Bean
- public FinSysTenantCacheProvider finSysTenantCacheProvider(RedisHelper redisHelper, FinSysTenantService finSysTenantService){
+ public FinSysTenantCacheProvider finSysTenantCacheProvider(RedisHelper redisHelper,
+ FinSysTenantService finSysTenantService) {
RedisFinSysTenantCache cache = new RedisFinSysTenantCache();
cache.setRedisHelper(redisHelper);
cache.setFinSysTenantService(finSysTenantService);
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
index ea9e566..81de09f 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
@@ -37,7 +37,7 @@
import com.consum.base.pojo.FinSysTenantParam;
import com.consum.base.pojo.FinSysTenantSearchParam;
import com.consum.base.service.FinSysTenantService;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.base.service.FinSysTenantUserService;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.vo.FinSysTenantUserResult;
@@ -64,7 +64,7 @@
private FinSysTenantService finSysTenantService;
@Autowired
- private FinSysTenantUserServiceImpl finSysTenantUserService;
+ private FinSysTenantUserService finSysTenantUserService;
@Autowired
public FinSysTenantController(FinSysTenantService finSysTenantService) {
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index 9329e4f..25d05a3 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -1,7 +1,6 @@
package com.consum.base.controller;
import java.io.IOException;
-import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -40,7 +39,7 @@
import com.consum.base.pojo.response.UserVO;
import com.consum.base.service.FinSysTenantDepartmentService;
import com.consum.base.service.FinSysTenantService;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.base.service.FinSysTenantUserService;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
@@ -78,7 +77,7 @@
private String roleName;
- private FinSysTenantUserServiceImpl finSysTenantUserService;
+ private FinSysTenantUserService finSysTenantUserService;
private UserServiceImpl userService;
@@ -96,7 +95,7 @@
@Autowired
public FinSysTenantUserController(FinSysTenantService finSysTenantService,
- FinSysTenantUserServiceImpl finSysTenantUserService, RoleServiceImpl roleService) {
+ FinSysTenantUserService finSysTenantUserService, RoleServiceImpl roleService) {
this.finSysTenantUserService = finSysTenantUserService;
this.finSysTenantService = finSysTenantService;
this.roleService = roleService;
@@ -114,75 +113,38 @@
CommonUtil.copyProperties(param, param2);
param = param2;
if (param.getTenantCode() == 0) {
- FinSysTenantUser user = new FinSysTenantUser();
- Long id = this.getCurrentUser().getId();
- user.setSysUserId(id);
- List<FinSysTenantUser> select = finSysTenantUserService.select(user);
- if (select.size() > 0) {
- param.setTenantCode(new Long(select.get(0).getTenantCode()));
+ String tenantId = this.getSysInfo().getTenantId();
+ FinSysTenant finSysTenant = finSysTenantService.selectById(Long.valueOf(tenantId));
+ if (finSysTenant != null) {
+ param.setTenantCode(Long.valueOf(finSysTenant.getCode()));
}
}
GenericPager<FinSysTenantUser> pager = this.finSysTenantUserService.queryAllPageUser(param);
- List<FinSysTenantUserVO> resultList = Lists.newArrayList();
- List<FinSysTenantUser> datas = pager.getDatas();
- if (datas.size() > 0) {
- for (FinSysTenantUser finSysTenantUser : datas) {
- FinSysTenantUserVO userVO = new FinSysTenantUserVO();
- if (finSysTenantUser.getUserPhone() != null) {
- // 瑙ｅ瘑骞惰劚鏁�
- String tel = null;
- try {
- tel = AESUtils.decryptStrAES(finSysTenantUser.getUserPhone(), PlatformRSAUtils.AES_KEY);
- } catch (Exception e) {
- logger.error("瑙ｅ瘑鎵嬫満鍙峰け璐ワ紝鍘熷洜锛�" + e);
- tel = null;
- }
- if (StringUtils.isNotEmpty(tel)) {
- finSysTenantUser.setUserPhone(PhoneNumberUtils.maskMobile(tel));
- } else {
- finSysTenantUser.setUserPhone("");
- }
- } else {
- finSysTenantUser.setUserPhone("");
- }
+ List<FinSysTenantUserVO> resultList = new ArrayList<>();
+ for (FinSysTenantUser finSysTenantUser : pager.getDatas()) {
+ FinSysTenantUserVO userVO = new FinSysTenantUserVO();
+ String tel = finSysTenantUser.getUserPhone() != null
+ ? AESUtils.decryptStrAES(finSysTenantUser.getUserPhone(), PlatformRSAUtils.AES_KEY) : null;
+ finSysTenantUser.setUserPhone(StringUtils.isNotEmpty(tel) ? PhoneNumberUtils.maskMobile(tel) : "");
- // 寰幆鍘绘煡瑙掕壊
- Long sysUserId = finSysTenantUser.getSysUserId();
- if (sysUserId != null) {
- List<S_role> list = finSysTenantUserService.getByUserId(sysUserId);
- String roleStr = "";
- for (S_role s_role : list) {
- roleStr = roleStr + s_role.getRole_name() + " ";
- }
- finSysTenantUser.setRoleStr(roleStr);
- }
+ List<S_role> list = finSysTenantUserService.getByUserId(finSysTenantUser.getSysUserId());
+ StringBuilder roleStr = new StringBuilder();
+ list.forEach(s_role -> roleStr.append(s_role.getRole_name()).append(" "));
+ finSysTenantUser.setRoleStr(roleStr.toString());
- // 寰幆鏌ヨ杩愮淮鍟唅d
- if (finSysTenantUser.getSupplierId() != null) {
- finSysTenantUser.setIsSupplier("鏄�");
- } else {
- finSysTenantUser.setIsSupplier("鍚�");
- }
- BeanUtils.copyProperties(finSysTenantUser, userVO);
- Long sysDeptId = finSysTenantUser.getSysDeptId();
- FinSysTenantDepartment department = finSysTenantDepartmentService.getById(sysDeptId);
- if (Objects.nonNull(department)) {
- userVO.setSysDeptName(department.getName());
- }
- resultList.add(userVO);
+ finSysTenantUser.setIsSupplier(finSysTenantUser.getSupplierId() != null ? "鏄�" : "鍚�");
+
+ BeanUtils.copyProperties(finSysTenantUser, userVO);
+ FinSysTenantDepartment department = finSysTenantDepartmentService.getById(finSysTenantUser.getSysDeptId());
+ if (Objects.nonNull(department)) {
+ userVO.setSysDeptName(department.getName());
}
+ resultList.add(userVO);
}
- try {
- Field fieldDatas = GenericPager.class.getDeclaredField("datas");
- // fieldDatas.setAccessible(true);
- // fieldDatas.set(pager, resultList);
- ReflectUtil.setFieldValue(pager, fieldDatas, resultList);
+ ReflectUtil.setFieldValue(pager, "datas", resultList);
- } catch (Exception e) {
- logger.error("鍒嗛〉鍒楄〃鏌ヨ澶辫触锛屽師鍥狅細" + e);
- }
return ResponseValue.success(pager);
}
@@ -213,25 +175,41 @@
return ResponseValue.error("鍙傛暟涓虹┖");
}
// 鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
- if (finSysTenantUserService.getByUserCode(tenantUser.getUserCode()) != null
- && finSysTenantUserService.getByUserCode(tenantUser.getUserCode()) > 0) {
+ FinSysTenantUser userCode = finSysTenantUserService.getByUserCode(tenantUser.getUserCode());
+ if (userCode != null) {
return ResponseValue.error("鍛樺伐缂栧彿閲嶅");
}
-
if (StringUtils.isEmpty(tenantUser.getTenantId()) || "0".equals(tenantUser.getTenantId())) {
return ResponseValue.error("娣诲姞鏃惰閫夋嫨鍖哄幙");
}
- if (StringUtils.isEmpty(tenantUser.getTenantCode()) || "0".equals(tenantUser.getTenantCode())) {
- return ResponseValue.error("娣诲姞鏃惰閫夋嫨鍖哄幙");
- }
// 鎻掑叆绯荤粺鐢ㄦ埛
+ buildTenantUser(tenantUser, null);
+ this.finSysTenantUserService.insert(tenantUser);
+
+ // 鎻掑叆骞冲彴鐢ㄦ埛
+ S_user_core userCore = getsUserCore(tenantUser);
+ this.userService.insert(userCore);
+ // 鎻掑叆骞冲彴鏈烘瀯
+ // 灏戣鑹瞚d
+ // 鏈烘瀯id 澶氫釜
+ List<Long> roleList = user.getRoleList();
+ if (!CollectionUtils.isEmpty(roleList)) {
+ // 鐢ㄦ埛id
+ Long sysUserId = tenantUser.getSysUserId();
+ this.finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
+ }
+ // this.getFinCustomerCache().remove();
+ return ResponseValue.success(1);
+ }
+
+ private void buildTenantUser(FinSysTenantUser tenantUser, FinSysTenantUser sysInfo) {
tenantUser.setId(NumberGenerator.getLongSequenceNumber());
tenantUser.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
tenantUser.setCreateBy(this.getCurrentUser().getUser_name());
tenantUser.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
tenantUser.setUpdateBy(this.getCurrentUser().getUser_name());
- // user.setStatus(1);// 0绂佺敤 1鍚敤
+ // 鏄惁鍒犻櫎 0鏄� 1鍚�
tenantUser.setIsDelete(0);
tenantUser.setSysUserId(NumberGenerator.getLongSequenceNumber());
// 鍔犲瘑鎵嬫満鍙�
@@ -241,32 +219,46 @@
encPhone = AESUtils.encryptStrAES(tenantUser.getUserPhone(), key);
}
tenantUser.setUserPhone(encPhone);
- // 鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
- // tenantUser.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
- this.finSysTenantUserService.insert(tenantUser);
+ String tenantId = tenantUser.getTenantId();
+ FinSysTenant finSysTenant = finSysTenantService.selectById(Long.valueOf(tenantId));
+ tenantUser.setTenantCode(finSysTenant.getCode());
- // 鎻掑叆骞冲彴鐢ㄦ埛
+ // 澶勭悊鏂规硶addSupplier
+ if (sysInfo != null) {
+ tenantUser.setIsDelete(1);
+ tenantUser.setLv(sysInfo.getLv());
+ tenantUser.setTenantCode(sysInfo.getTenantCode());
+ tenantUser.setTenantId(sysInfo.getTenantId());
+ // 杩愮淮绠＄悊
+ tenantUser.setSysDeptId(2l);
+ }
+
+ }
+
+ private S_user_core getsUserCore(FinSysTenantUser tenantUser) {
S_user_core userCore = new S_user_core();
userCore.setId(tenantUser.getSysUserId());
- userCore.setDept_id(3L); // 閮ㄩ棬id锛岀洰鍓嶅啓姝�
- userCore.setOrg_id(tenantUser.getSysDeptId()); // 鏈烘瀯id
+ // 閮ㄩ棬id 閮ㄩ棬淇℃伅鏈悓姝ワ紝鍙～鍏呮暟鎹�
+ userCore.setDept_id(tenantUser.getSysDeptId());
+ // 鏈烘瀯id
+ userCore.setOrg_id(tenantUser.getSysDeptId());
userCore.setOrg_id(1L);
- userCore.setUser_name(tenantUser.getUserCode()); // 鐢ㄦ埛璐﹀彿
+ // 鐢ㄦ埛璐﹀彿
+ userCore.setUser_name(tenantUser.getUserCode());
userCore.setNick_name(tenantUser.getUserName());
// 鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
userCore.setUser_type(2);
- userCore.setPhonenumber(encPhone);
+ userCore.setPhonenumber(tenantUser.getUserPhone());
userCore.setSex(tenantUser.getSex().toString());
// 鍒濆鍖栧瘑鐮� 123456
String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
userCore.setPassword(pws);
// 骞冲彴鐢ㄦ埛琛ㄥ拰绯荤粺鐢ㄦ埛 琛ㄧ姸鎬佺浉鍙�
if (tenantUser.getStatus() == 0) {
- tenantUser.setStatus(1);
+ userCore.setStatus(1);
} else {
- tenantUser.setStatus(0);
+ userCore.setStatus(0);
}
- userCore.setStatus(tenantUser.getStatus());
userCore.setDel_flag(0);
userCore.setCreate_by(this.getCurrentUser().getUser_name());
userCore.setCreate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
@@ -289,16 +281,7 @@
userCore.setType(1);
// 鍟嗘埛id锛�0-骞冲彴
userCore.setMer_id(0L);
- this.userService.insert(userCore);
- // 鎻掑叆骞冲彴鏈烘瀯
- // 灏戣鑹瞚d
- List<Long> roleList = user.getRoleList(); // 鏈烘瀯id 澶氫釜
- if (!CollectionUtils.isEmpty(roleList)) {
- Long sysUserId = tenantUser.getSysUserId(); // 鐢ㄦ埛id
- this.finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
- }
- // this.getFinCustomerCache().remove();
- return ResponseValue.success(1);
+ return userCore;
}
/**
@@ -335,7 +318,7 @@
throw new ImportUserParamVerifyException("鍗曞厓鏍间笉鑳戒负绌�!");
}
// 鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
- if (finSysTenantUserService.getByUserCode(data.getUserCode()) > 0) {
+ if (finSysTenantUserService.getByUserCode(data.getUserCode()) != null) {
throw new ImportUserParamVerifyException("鍛樺伐缂栧彿涓虹┖鎴栧凡瀛樺湪!");
}
if (data.getSex() < 1 && data.getSex() > 0) {
@@ -415,49 +398,7 @@
ArrayList<S_user_core> sUserCores = new ArrayList<>();
for (FinSysTenantUser user : finSysTenantUsers) {
// 鎻掑叆骞冲彴鐢ㄦ埛
- S_user_core userCore = new S_user_core();
- userCore.setId(user.getSysUserId());
- userCore.setDept_id(3L); // 閮ㄩ棬id锛岀洰鍓嶅啓姝�
- userCore.setOrg_id(user.getSysDeptId()); // 鏈烘瀯id
- userCore.setOrg_id(1L);
- userCore.setUser_name(user.getUserCode()); // 鐢ㄦ埛璐﹀彿
- userCore.setNick_name(user.getUserName());
- // 鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
- userCore.setUser_type(2);
- userCore.setPhonenumber(user.getUserPhone());
- userCore.setSex(user.getSex().toString());
- // 鍒濆鍖栧瘑鐮� 123456
- String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
- userCore.setPassword(pws);
- // 骞冲彴鐢ㄦ埛琛ㄥ拰绯荤粺鐢ㄦ埛 琛ㄧ姸鎬佺浉鍙�
- if (user.getStatus() == 0) {
- user.setStatus(1);
- } else {
- user.setStatus(0);
- }
- userCore.setStatus(user.getStatus());
- userCore.setDel_flag(0);
- userCore.setCreate_by(this.getCurrentUser().getUser_name());
- userCore.setCreate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- userCore.setRemark(user.getRemark());
- userCore.setType(1);
- userCore.setBind_client_id("0");
- userCore.setBind_wechat(0);
- userCore.setModify_pwd(0);
- userCore.setBind_mobile(0);
- userCore.setBind_mail(0);
- userCore.setProfile_id(0L);
- userCore.setIs_wechat_public(0);
- userCore.setIs_wechat_routine(0);
- userCore.setIs_wechat_ios(0);
- userCore.setIs_wechat_android(0);
- userCore.setIs_logoff(0);
- userCore.setLogoff_time(0L);
- userCore.setIs_sms(0);
- // 绠＄悊鍛樼被鍨嬶細1= 骞冲彴瓒呯, 2=鍟嗘埛瓒呯, 3=绯荤粺绠＄悊鍛橈紝4=鍟嗘埛绠＄悊鍛�
- userCore.setType(1);
- // 鍟嗘埛id锛�0-骞冲彴
- userCore.setMer_id(0L);
+ S_user_core userCore = getsUserCore(user);
sUserCores.add(userCore);
}
// 淇濆瓨鐢ㄦ埛淇℃伅
@@ -503,17 +444,37 @@
// 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
finSysTenantUserService.update(tenantUser);
// 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
+ S_user_core userCore = buildUpdateUserCore(user);
+ this.userService.update(userCore);
+ // 3. 鏇存柊瑙掕壊閰嶇疆 S_ROLE_USER
+ // 1. 鏍规嵁 user.getSysUserId() 鏌ヨ
+ // 宸叉湁鐨勬潈闄�
+ Long sysUserId = user.getSysUserId();
+ List<S_role> list = finSysTenantUserService.getByUserId(sysUserId);
+ // 閫夋嫨鐨勬潈闄�
+ List<Long> roleList = user.getRoleList();
+ // 鍏堝垹闄ゅ啀娣诲姞
+ if (list != null && list.size() > 0) {
+ finSysTenantUserService.execDelRoleUserList(sysUserId);
+ }
+ if (roleList != null && roleList.size() > 0) {
+ finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
+ }
+ this.getFinSysTenantUserCache().remove(sysUserId.toString());
+ return ResponseValue.success(1);
+ }
+
+ private S_user_core buildUpdateUserCore(FinSysTenantUser user) {
S_user_core userCore = new S_user_core();
userCore.setId(user.getSysUserId());
userCore.setUpdate_by(this.getCurrentUser().getUser_name());
userCore.setUpdate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
// 骞冲彴鐢ㄦ埛琛ㄥ拰绯荤粺鐢ㄦ埛 琛ㄧ姸鎬佺浉鍙�
if (user.getStatus() == 0) {
- user.setStatus(1);
+ userCore.setStatus(1);
} else {
- user.setStatus(0);
+ userCore.setStatus(0);
}
- userCore.setStatus(user.getStatus());
if (user.getSex() != null) {
userCore.setSex(user.getSex().toString());
}
@@ -521,20 +482,8 @@
userCore.setNick_name(user.getUserName());
// 鍔犲瘑鎵嬫満鍙�
userCore.setPhonenumber(user.getUserPhone());
- this.userService.update(userCore);
- // 3. 鏇存柊瑙掕壊閰嶇疆 S_ROLE_USER
- // 1. 鏍规嵁 user.getSysUserId() 鏌ヨ
- List<S_role> list = finSysTenantUserService.getByUserId(user.getSysUserId()); // 宸叉湁鐨勬潈闄�
- List<Long> roleList = user.getRoleList(); // 閫夋嫨鐨勬潈闄�
- // 鍏堝垹闄ゅ啀娣诲姞
- if (list != null && list.size() > 0) {
- finSysTenantUserService.execDelRoleUserList(user.getSysUserId());
- }
- if (roleList != null && roleList.size() > 0) {
- finSysTenantUserService.execInsertRoleUserList(roleList, user.getSysUserId());
- }
- this.getFinSysTenantUserCache().remove(user.getSysUserId() + "");
- return ResponseValue.success(1);
+
+ return userCore;
}
/**
@@ -552,25 +501,14 @@
return ResponseValue.error("鍙傛暟涓虹┖");
}
// 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER 搴旇鏄煡璇� 鐒跺悗鍙敼鐘舵��
- List<FinSysTenantUser> select = finSysTenantUserService.select(new FinSysTenantUser(tenantUser.getId()));
- if (select == null || select.size() == 0) {
+ FinSysTenantUser finSysTenantUser = finSysTenantUserService.queryOneById(tenantUser.getId().toString());
+ if (finSysTenantUser == null) {
return ResponseValue.error("鐢ㄦ埛涓嶅瓨鍦�");
}
- FinSysTenantUser finSysTenantUser = select.get(0);
finSysTenantUser.setStatus(user.getStatus());
finSysTenantUserService.update(finSysTenantUser);
// 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
- S_user_core userCore = new S_user_core();
- userCore.setId(user.getSysUserId());
- userCore.setUpdate_by(this.getCurrentUser().getUser_name());
- userCore.setUpdate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- // 骞冲彴鐢ㄦ埛琛ㄥ拰绯荤粺鐢ㄦ埛 琛ㄧ姸鎬佺浉鍙�
- if (user.getStatus() == 0) {
- user.setStatus(1);
- } else {
- user.setStatus(0);
- }
- userCore.setStatus(user.getStatus());
+ S_user_core userCore = buildUpdateUserCore(tenantUser);
this.userService.update(userCore);
return ResponseValue.success(1);
}
@@ -591,13 +529,14 @@
return ResponseValue.error("鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
// 鍒濆鍖栧瘑鐮� 123456
- String stringValue = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();// 瀵嗘枃
+ // 瀵嗘枃
+ String password = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
// 1. 淇敼鐢ㄦ埛琛�
// 鐢ㄦ埛琛╥d
Long sysUserId = user.getSysUserId();
S_user_core userCore = new S_user_core();
userCore.setId(sysUserId);
- userCore.setPassword(stringValue);
+ userCore.setPassword(password);
userCore.setModify_pwd(0);
userService.update(userCore);
// 2. 淇敼骞冲彴鐢ㄦ埛锛堜笉鐢ㄤ慨鏀癸級
@@ -693,8 +632,10 @@
return ResponseValue.error("鍙傛暟涓虹┖");
}
// 1. 鏍规嵁 user.getSysUserId() 鏌ヨ
- List<S_role> list = finSysTenantUserService.getByUserId(user.getSysUserId()); // 宸叉湁鐨勬潈闄�
- List<Long> roleList = user.getRoleList(); // 閫夋嫨鐨勬潈闄�
+ // 宸叉湁鐨勬潈闄�
+ List<S_role> list = finSysTenantUserService.getByUserId(user.getSysUserId());
+ // 閫夋嫨鐨勬潈闄�
+ List<Long> roleList = user.getRoleList();
// 鍏堝垹闄ゅ啀娣诲姞
if (list != null && list.size() > 0) {
finSysTenantUserService.execDelRoleUserList(user.getSysUserId());
@@ -726,76 +667,18 @@
return ResponseValue.error(roleName + "鐨勮鑹蹭笉瀛樺湪");
}
// 鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
- if (finSysTenantUserService.getByUserCode(user.getUserCode()) != null
- && finSysTenantUserService.getByUserCode(user.getUserCode()) > 0) {
+ if (finSysTenantUserService.getByUserCode(user.getUserCode()) != null) {
return ResponseValue.error("鍛樺伐缂栧彿閲嶅");
}
FinSysTenantUser sysInfo = this.getSysInfo();
// 鎻掑叆绯荤粺鐢ㄦ埛
- user.setId(NumberGenerator.getLongSequenceNumber());
- user.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- user.setCreateBy(this.getCurrentUser().getUser_name());
- user.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- user.setUpdateBy(this.getCurrentUser().getUser_name());
- user.setIsDelete(0);// 鏄惁鍒犻櫎 0鏄� 1鍚�
- user.setSysUserId(NumberGenerator.getLongSequenceNumber());
- user.setIsDelete(1);
- user.setLv(sysInfo.getLv());
- user.setTenantCode(sysInfo.getTenantCode());
- user.setTenantId(sysInfo.getTenantId());
- user.setSysDeptId(2l); // 杩愮淮绠＄悊
- // 鍔犲瘑鎵嬫満鍙�
- String key = PlatformRSAUtils.AES_KEY;
- String userPhone = user.getUserPhone();
- String encPhone = "";
- if (userPhone != null) {
- encPhone = AESUtils.encryptStrAES(userPhone, key);
- user.setUserPhone(encPhone);
- }
-
+ buildTenantUser(user, sysInfo);
this.finSysTenantUserService.insert(user);
// 鎻掑叆骞冲彴鐢ㄦ埛
- S_user_core userCore = new S_user_core();
- userCore.setId(user.getSysUserId());
- userCore.setDept_id(depts.get(0).getId()); // 閮ㄩ棬
- userCore.setOrg_id(1L);
- // userCore.setUser_name(); //鐢ㄦ埛璐﹀彿
- userCore.setUser_name(user.getUserCode()); // 鐢ㄦ埛璐﹀彿
- userCore.setNick_name(user.getUserName());
- // 鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
- userCore.setUser_type(2);
-
- userCore.setPhonenumber(userPhone);
- // 鍒濆鍖栧瘑鐮� 123456
- String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
- userCore.setPassword(pws);
- if (user.getStatus() == 0) {
- userCore.setStatus(1);
- } else {
- userCore.setStatus(0);
- }
- userCore.setDel_flag(0);
- userCore.setCreate_by(this.getCurrentUser().getCreate_by());
- userCore.setCreate_time(DateUtils.getDateTimeNumber());
- userCore.setRemark(user.getRemark());
- userCore.setType(1);
- userCore.setBind_client_id("0");
- userCore.setBind_wechat(0);
- userCore.setModify_pwd(0);
- userCore.setBind_mobile(0);
- userCore.setBind_mail(0);
- userCore.setProfile_id(0L);
- userCore.setIs_wechat_public(0);
- userCore.setIs_wechat_routine(0);
- userCore.setIs_wechat_ios(0);
- userCore.setIs_wechat_android(0);
- userCore.setIs_logoff(0);
- userCore.setLogoff_time(0L);
- userCore.setIs_sms(0);
- // 绠＄悊鍛樼被鍨嬶細1= 骞冲彴瓒呯, 2=鍟嗘埛瓒呯, 3=绯荤粺绠＄悊鍛橈紝4=鍟嗘埛绠＄悊鍛�
+ S_user_core userCore = buildUpdateUserCore(user);
+ // 閮ㄩ棬
+ userCore.setDept_id(depts.get(0).getId());
userCore.setType(2);
- // 鍟嗘埛id锛�0-骞冲彴
- userCore.setMer_id(0L);
this.userService.insert(userCore);
// 鎻掑叆骞冲彴鏈烘瀯
// 灏戣鑹瞚d
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
index 7fbe456..bfb6d88 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
@@ -27,7 +27,7 @@
import com.consum.base.pojo.response.FormInventoryDetailVO;
import com.consum.base.pojo.response.FormInventoryGoodsVO;
import com.consum.base.pojo.response.FormInventoryVO;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.base.service.FinSysTenantUserService;
import com.consum.base.service.LWhFormInventoryService;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormInventory;
@@ -58,7 +58,7 @@
@Autowired
private LWhFormInventoryService lWhFormInventoryService;
@Autowired
- private FinSysTenantUserServiceImpl finSysTenantUserService;
+ private FinSysTenantUserService finSysTenantUserService;
/**
* @Description 鏂板
@@ -329,7 +329,8 @@
map.put("monitorName", monitorName);
map.put("name", operatorName);
Workbook workbook = ExcelExportUtil.exportExcel(params, InventoryExcelTemplate.class, exportList, map);
- return ResponseValue.success(downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook));
+ String filePath = downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index 4debc58..81cb5cb 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -215,7 +215,7 @@
@ApiOperation(value = "鍑哄簱鍗曞鍑�", notes = "鍑哄簱鍗曞鍑�")
@ApiImplicitParam(name = "id", value = "鍑哄簱鍗昳d", required = true, dataType = "Long", paramType = "query")
@GetMapping("/list/export")
- public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
+ public ResponseValue export(Long id, HttpServletResponse response) throws Exception {
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -251,7 +251,8 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, OutputExcelTemplate.class, exportList, map);
- return ResponseValue.success(downLoadExcel("鍑哄簱鍗�", response, workbook));
+ String filePath = downLoadExcel("鍑哄簱鍗�", response, workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index ce0020d..55fb56c 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -1,8 +1,24 @@
package com.consum.base.controller;
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
-import cn.hutool.core.util.ReflectUtil;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.compress.utils.Lists;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.PageUtil;
@@ -11,7 +27,11 @@
import com.consum.base.pojo.dto.GoodModelInfoDTO;
import com.consum.base.pojo.excel.ProcureExcelTemplate;
import com.consum.base.pojo.query.FormProcureQry;
-import com.consum.base.pojo.response.*;
+import com.consum.base.pojo.response.FormProcureVO;
+import com.consum.base.pojo.response.GoodsModelVO;
+import com.consum.base.pojo.response.GoodsTemplateCountVO;
+import com.consum.base.pojo.response.GoodsTemplateInfoVO;
+import com.consum.base.pojo.response.LWhFormProcureExtendVO;
import com.consum.base.service.LWhFormProcureGoodsService;
import com.consum.base.service.LWhFormProcureService;
import com.consum.base.service.LWhProcureModelService;
@@ -24,19 +44,14 @@
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.web.ResponseValue;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.util.ReflectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.compress.utils.Lists;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.lang.reflect.Field;
-import java.util.*;
/**
* @ClassName LWhFormProcureController
@@ -305,7 +320,8 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, ProcureExcelTemplate.class, exportList, map);
- return ResponseValue.success(downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook));
+ String filePath = downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
index 5dd5043..e44488e 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
@@ -186,7 +186,8 @@
map.put("totalAmount", totalAmount);
Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExcelTemplate.class, export, map);
- return ResponseValue.success(downLoadExcel("鎶ュ簾鐧昏鍗�", response, sheets));
+ String filePath = downLoadExcel("鎶ュ簾鐧昏鍗�", response, sheets);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index cb9cf66..e5fa35c 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -322,7 +322,8 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, TransferExcelTemplate.class, export, map);
- return ResponseValue.success(downLoadExcel(fileName, response, workbook));
+ String filePath = downLoadExcel(fileName, response, workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java b/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java
new file mode 100644
index 0000000..8143561
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java
@@ -0,0 +1,43 @@
+package com.consum.base.service;
+
+import java.util.List;
+
+import com.consum.base.pojo.FinSysTenantUserSearchParam;
+import com.consum.model.po.FinSysTenantUser;
+import com.iplatform.model.po.S_dept;
+import com.iplatform.model.po.S_role;
+import com.walker.db.page.GenericPager;
+import com.walker.jdbc.service.BaseService;
+
+/**
+ * FinSysTenantUserService
+ *
+ * @author asus
+ * @version 2023/12/12 14:11
+ **/
+public interface FinSysTenantUserService extends BaseService {
+
+ GenericPager<FinSysTenantUser> queryAllPageUser(FinSysTenantUserSearchParam param);
+
+ FinSysTenantUser queryOneById(String id);
+
+ FinSysTenantUser queryOneBySysId(String sysUserId);
+
+ FinSysTenantUser queryOneByUserId(String userId);
+
+ void execInsertRoleUserList(List<Long> roleIdList, Long userId);
+
+ void execInsertRoleUserList(List<FinSysTenantUser> finSysTenantUsers);
+
+ void execDelRoleUserList(Long userId);
+
+ FinSysTenantUser getByUserCode(String userCode);
+
+ List<S_role> getByUserId(Long userId);
+
+ List<S_role> getRoleAll();
+
+ List<S_dept> selectDept(String deptName);
+
+ List<FinSysTenantUser> getByOrgId(Long orgId);
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
index 2268ac2..c4c714c 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
@@ -14,7 +14,7 @@
import com.consum.base.pojo.WarehouseManagerInfo;
import com.consum.base.pojo.request.WarehouseManagerParam;
import com.consum.base.service.BaseWarehouseManagerService;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.base.service.FinSysTenantUserService;
import com.consum.model.po.BaseWarehouseManager;
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.model.po.S_role;
@@ -30,7 +30,7 @@
public class BaseWarehouseManagerServiceImpl extends BaseServiceImpl implements BaseWarehouseManagerService {
@Autowired
- private FinSysTenantUserServiceImpl finSysTenantUserService;
+ private FinSysTenantUserService finSysTenantUserService;
/**
* @return
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java
similarity index 88%
rename from consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java
index cb746a6..7551184 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java
@@ -1,4 +1,12 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
+
+import com.consum.base.service.FinSysTenantUserService;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.model.po.FinSysTenantUser;
@@ -9,15 +17,9 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
@Service
-public class FinSysTenantUserServiceImpl extends BaseServiceImpl {
+public class FinSysTenantUserServiceImpl extends BaseServiceImpl implements FinSysTenantUserService {
private static final String SQL_GET_USER =
"SELECT * FROM fin_sys_tenant_user WHERE IS_DELETE = 0 AND `STATUS` = 1 AND TENANT_ID = ?";
@@ -50,6 +52,7 @@
* @Author wh
* @Date 2023/7/17 14:26
*/
+ @Override
public GenericPager<FinSysTenantUser> queryAllPageUser(FinSysTenantUserSearchParam param) {
Map<String, Object> parameter = new HashMap<>(5);
StringBuilder sql = new StringBuilder(SQL_QH_PAGE_USER_PREFIX);
@@ -118,6 +121,7 @@
return this.selectSplit(sql.toString(), parameter, new FinSysTenantUser());
}
+ @Override
public FinSysTenantUser queryOneById(String id) {
FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
finSysTenantUser.setId(Long.valueOf(id));
@@ -127,7 +131,9 @@
}
return null;
}
- public FinSysTenantUser queryOneBySysId(String sysUserId) {
+
+ @Override
+ public FinSysTenantUser queryOneBySysId(String sysUserId) {
FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
finSysTenantUser.setSysUserId(Long.valueOf(sysUserId));
List<FinSysTenantUser> finSysTenantUserList = this.select(finSysTenantUser);
@@ -137,14 +143,10 @@
return null;
}
+ @Override
public FinSysTenantUser queryOneByUserId(String userId) {
- List<FinSysTenantUser> finSysTenantUserList =
- this.select(SQL_TENANT_USER, new Object[] {userId}, new FinSysTenantUser());
- if (finSysTenantUserList.size() > 0) {
- return finSysTenantUserList.get(0);
- } else {
- return null;
- }
+ FinSysTenantUser finSysTenantUser = this.get(SQL_TENANT_USER, new Object[] {userId}, new FinSysTenantUser());
+ return finSysTenantUser;
}
/**
@@ -153,6 +155,7 @@
* @param roleIdList
* @param userId
*/
+ @Override
public void execInsertRoleUserList(List<Long> roleIdList, Long userId) {
List<Object[]> parameters = new ArrayList<>();
Object[] one = null;
@@ -168,6 +171,7 @@
/**
* 鎵归噺娣诲姞瑙掕壊瀵瑰簲鐨勭敤鎴枫�傛敮鎸佸悓鏃跺涓敤鎴�
*/
+ @Override
public void execInsertRoleUserList(List<FinSysTenantUser> finSysTenantUsers) {
List<Object[]> parameters = new ArrayList<>();
for (FinSysTenantUser finSysTenantUser : finSysTenantUsers) {
@@ -188,6 +192,7 @@
*
* @param userId
*/
+ @Override
public void execDelRoleUserList(Long userId) {
List<Object[]> parameters = new ArrayList<>();
Object[] one = new Object[1];
@@ -196,19 +201,7 @@
this.execBatchUpdate(SQL_DELETE_ROLE_USER, parameters);
}
- /**
- * 鏍规嵁鐢ㄦ埛id鍜岃鑹瞚d鍒犻櫎鐢ㄦ埛瑙掕壊
- *
- * @param userId
- */
- public void execDeleteRoleByUserIdAndRoleId(Long userId, Long roleId) {
- List<Object[]> parameters = new ArrayList<>();
- Object[] one = new Object[2];
- one[0] = userId;
- one[1] = roleId;
- parameters.add(one);
- this.execBatchUpdate(SQL_DELETE_ROLE_BY_USER_ID_AND_ROLE_ID, parameters);
- }
+
/**
* 鏍规嵁userCode鏌ヨ閲嶅銆�
@@ -216,18 +209,14 @@
* @param userCode 鐢ㄦ埛鐧诲綍鏍囪瘑
* @return
*/
- public Integer getByUserCode(String userCode) {
+ @Override
+ public FinSysTenantUser getByUserCode(String userCode) {
Map<String, Object> parameter = new HashMap<>();
StringBuilder sql = new StringBuilder(SQL_SELECT_USER_CODE);
- sql.append("and USER_CODE= :userCode");
+ sql.append("and USER_CODE= :userCode");
parameter.put("userCode", userCode);
- sql.append(" limit 1");
- List<FinSysTenantUser> select = this.select(sql.toString(), parameter, new FinSysTenantUser());
- Integer flag = 0;
- if (select != null && select.size() > 0) {
- flag = select.size();
- }
- return flag;
+ FinSysTenantUser finSysTenantUser = this.get(sql.toString(), parameter, new FinSysTenantUser());
+ return finSysTenantUser;
}
/**
@@ -236,6 +225,7 @@
* @param userId
* @return
*/
+ @Override
public List<S_role> getByUserId(Long userId) {
Map<String, Object> parameter = new HashMap<>();
StringBuilder sql = new StringBuilder(SQL_SELECT_USER_ID);
@@ -250,6 +240,7 @@
*
* @return
*/
+ @Override
public List<S_role> getRoleAll() {
Map<String, Object> parameter = new HashMap<>();
StringBuilder sql = new StringBuilder(SQL_SELECT_USER_ID);
@@ -257,6 +248,7 @@
return select;
}
+ @Override
public List<S_dept> selectDept(String deptName) {
StringBuilder sqlStr = new StringBuilder(SQL_DEPT_ROLES);
Map<String, Object> paramts = new HashMap<>();
@@ -271,6 +263,7 @@
* @Author wh
* @Date 2023/10/4 15:49
*/
+ @Override
public List<FinSysTenantUser> getByOrgId(Long orgId) {
return this.select(SQL_GET_USER, new Object[] {orgId}, new FinSysTenantUser());
}
--
Gitblit v1.9.1