From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java
index 00e9df8..86b537b 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java
@@ -1,12 +1,16 @@
package com.matrix.system.common.service.impl;
+import cn.hutool.crypto.SecureUtil;
+import com.matrix.component.redis.RedisClient;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.constance.SystemErrorCode;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
+import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.ModelUtils;
import com.matrix.core.tools.WebUtil;
+import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.bean.SysUserLoginRecord;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
@@ -15,12 +19,11 @@
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.common.tools.ServiceUtil;
+import com.matrix.system.hive.bean.AppVersion;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysProjServices;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.dao.SysShopInfoDao;
-import com.matrix.system.hive.plugin.util.CollectionUtils;
-import com.matrix.system.hive.plugin.util.DateUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -44,7 +47,8 @@
private static final String SU_ID = "su_id";
private static final String SU_ACCOUNT = "su_account";
-
+ @Autowired
+ RedisClient redisClient;
@Autowired
private SysUsersDao sysUsersDao;
@@ -127,8 +131,12 @@
}
if (modifyMap.size() > 0) {
modifyMap.put("suId", oldSysUsers.getSuId());
- return sysUsersDao.updateByMap(modifyMap);
+ sysUsersDao.updateByMap(modifyMap);
}
+ //删除用户权限缓存
+ String redisKey=DefaultAuthorityManager.USER_POWER_REDISKEY+ SecureUtil.md5(oldSysUsers.getSuId()+"");
+ redisClient.removeObject(redisKey);
+
return MatrixConstance.DML_SUCCESSS;
}
@@ -253,9 +261,13 @@
sysProjServices.setStartTime(sysProjServices.getStartTime());
sysProjServices
- .setEndTime(DateUtils.getNextNMinute(sysProjServices.getStartTime(), sysProjServices.getTotalTime()));
+ .setEndTime(DateUtil.getNextNMinute(sysProjServices.getStartTime(), sysProjServices.getTotalTime()));
return sysUsersDao.findByCodeBeaStateShopCount(shopId, sysProjServices, panBanCodes);
}
+ @Override
+ public List<AppVersion> findAppVersion() {
+ return sysUsersDao.selectAppVersion();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1